From 7bdb4d97483f5a2b279b3bee0b044f13f08b6483 Mon Sep 17 00:00:00 2001 From: D-AIRY <admin@ds-servers.com> Date: Thu, 2 Jul 2020 05:43:46 +0300 Subject: [PATCH] Fixed chat area; Fixed transparency rendering assert; Fixed TerraX props window --- build/gamesource/gui/ingame.html | 2 +- source/SkyXEngine.h | 2 +- source/render/RenderPipeline.cpp | 3 ++- source/terrax/mainWindow.cpp | 7 ++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build/gamesource/gui/ingame.html b/build/gamesource/gui/ingame.html index 9e1a7db95..debdf8ec6 100644 --- a/build/gamesource/gui/ingame.html +++ b/build/gamesource/gui/ingame.html @@ -35,6 +35,6 @@ <div style="position: fixed; top: 50%; left: 0; right: 0; bottom: 0;"><div id="aim_range" style="position: relative; top: 20px; text-align: center;font-size: 12px">1</div></div> <div id="dmg_overlay" style="position: fixed; top: 0px; left: 0px; bottom: 0px; right: 0px; background-image: /hud/damage_overlay.png;background-size-x: 100%;background-size-y: 100%; visisbility: hidden;"> </div> - <div id="chatlog"></div> + <div id="chatlog" style="overflow-y: visible;"></div> </body> </html> diff --git a/source/SkyXEngine.h b/source/SkyXEngine.h index f0ce3c3ed..63d606e9f 100644 --- a/source/SkyXEngine.h +++ b/source/SkyXEngine.h @@ -292,7 +292,7 @@ QT стиль документирования (!) и QT_AUTOBRIEF - корот #ifndef __SKYXENGINE_H #define __SKYXENGINE_H -#define SKYXENGINE_VERSION "X.9.1-dev" +#define SKYXENGINE_VERSION "X.9.2-dev" #define SKYXENGINE_VERSION4EDITORS "SkyXEngine version " ## SKYXENGINE_VERSION diff --git a/source/render/RenderPipeline.cpp b/source/render/RenderPipeline.cpp index 5ec47998e..f7882ce71 100644 --- a/source/render/RenderPipeline.cpp +++ b/source/render/RenderPipeline.cpp @@ -1105,10 +1105,11 @@ void CRenderPipeline::renderTransparencyBSP(XTransparentBSPNode *pNode, XTranspa pFirst = pNode->pFront; pSecond = pNode->pBack; } - if(pNode->iPSP >= 0) + if(pNode->iPSP >= 0 && uPlaneCount < MAX_TRANSPARENCY_CLIP_PANES) { pPSPs[pNode->iPSP].isRenderFront = !isInFront; puPlanesStack[uPlaneCount++] = (UINT)pNode->iPSP; + // assert(uPlaneCount <= MAX_TRANSPARENCY_CLIP_PANES); } if(pFirst) { diff --git a/source/terrax/mainWindow.cpp b/source/terrax/mainWindow.cpp index 1a70c5e5e..41a700d50 100644 --- a/source/terrax/mainWindow.cpp +++ b/source/terrax/mainWindow.cpp @@ -658,6 +658,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) static BOOL xSizing; static BOOL ySizing; + static bool shouldShowProps = false; static float fCoeffWidth = 0.0f; static float fCoeffHeight = 0.0f; @@ -836,18 +837,22 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_SIZE: { +#if 0 if(g_isPropWindowVisible) { if(wParam == SIZE_MINIMIZED) { g_isPropWindowVisible = g_pPropWindow->isVisible(); g_pPropWindow->hide(); + shouldShowProps = g_isPropWindowVisible; } - else if(wParam == SIZE_RESTORED) + else if(wParam == SIZE_RESTORED && shouldShowProps) { g_pPropWindow->show(); + shouldShowProps = false; } } +#endif GetClientRect(hWnd, &rect); rect.top += MARGIN_TOP; -- GitLab