mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-16 10:04:28 +02:00
Code Issues Releases Wiki Activity

redraw inventory background after changing detail settings

Browse Source
This commit is contained in:
XProger
2018-05-20 07:26:29 +03:00
parent 5fd45795c1
commit 0799647a0b
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gapi_d3d9.h
View File

@@ -463,11 +463,14 @@ namespace GAPI {
res.texture->deinit(); res.texture->deinit();
} }
if (defRT) { defRT->Release(); defRT = NULL; } if (defRT) defRT->Release();
if (defDS) { defDS->Release(); defDS = NULL; } if (defDS) defDS->Release();
D3DCHECK(device->Reset(&d3dpp)); D3DCHECK(device->Reset(&d3dpp));
device->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &defRT);
device->GetDepthStencilSurface(&defDS);
// reinit texture RTs // reinit texture RTs
for (int i = 0; i < tmpCount; i++) { for (int i = 0; i < tmpCount; i++) {
Resource &res = tmpList[i]; Resource &res = tmpList[i];

21
src/level.h
View File

@@ -50,7 +50,6 @@ struct Level : IGame {
bool lastTitle; bool lastTitle;
bool isEnded; bool isEnded;
bool isFirstFrame;
TR::Effect::Type effect; TR::Effect::Type effect;
float effectTimer; float effectTimer;
@@ -246,7 +245,7 @@ struct Level : IGame {
bool rebuildWater = settings.detail.water != Core::settings.detail.water; bool rebuildWater = settings.detail.water != Core::settings.detail.water;
bool rebuildShaders = rebuildWater || rebuildAmbient || rebuildShadows; bool rebuildShaders = rebuildWater || rebuildAmbient || rebuildShadows;
bool redraw = settings.detail.stereo != Core::settings.detail.stereo; bool redraw = memcmp(&settings.detail, &Core::settings.detail, sizeof(settings.detail)) != 0;
#ifdef _OS_ANDROID #ifdef _OS_ANDROID
if ((settings.detail.stereo == Core::Settings::STEREO_VR) ^ (Core::settings.detail.stereo == Core::Settings::STEREO_VR)) if ((settings.detail.stereo == Core::Settings::STEREO_VR) ^ (Core::settings.detail.stereo == Core::Settings::STEREO_VR))
@@ -282,8 +281,12 @@ struct Level : IGame {
waterCache = Core::settings.detail.water > Core::Settings::LOW ? new WaterCache(this) : NULL; waterCache = Core::settings.detail.water > Core::Settings::LOW ? new WaterCache(this) : NULL;
} }
if (redraw && inventory.active && !level.isTitle()) if (redraw && inventory.active && !level.isTitle()) {
Core::reset();
Core::beginFrame();
inventory.prepareBackground(); inventory.prepareBackground();
Core::endFrame();
}
} }
virtual TR::Level* getLevel() { virtual TR::Level* getLevel() {
@@ -704,6 +707,8 @@ struct Level : IGame {
initShadow(); initShadow();
initReflections();
for (int i = 0; i < level.soundSourcesCount; i++) { for (int i = 0; i < level.soundSourcesCount; i++) {
TR::SoundSource &src = level.soundSources[i]; TR::SoundSource &src = level.soundSources[i];
int flags = Sound::PAN; int flags = Sound::PAN;
@@ -723,8 +728,6 @@ struct Level : IGame {
sndWater = sndTrack = NULL; sndWater = sndTrack = NULL;
isFirstFrame = true;
playTrack(0); playTrack(0);
/* /*
if (level.id == TR::LVL_TR2_RIG) { if (level.id == TR::LVL_TR2_RIG) {
@@ -1238,6 +1241,8 @@ struct Level : IGame {
} }
void initReflections() { void initReflections() {
Core::reset();
Core::beginFrame();
for (int i = 0; i < level.entitiesBaseCount; i++) { for (int i = 0; i < level.entitiesBaseCount; i++) {
TR::Entity &e = level.entities[i]; TR::Entity &e = level.entities[i];
if (e.type == TR::Entity::CRYSTAL) { if (e.type == TR::Entity::CRYSTAL) {
@@ -1246,6 +1251,7 @@ struct Level : IGame {
c->environment->generateMipMap(); c->environment->generateMipMap();
} }
} }
Core::endFrame();
} }
void setMainLight(Controller *controller) { void setMainLight(Controller *controller) {
@@ -2374,11 +2380,6 @@ struct Level : IGame {
} }
void renderPrepare() { void renderPrepare() {
if (isFirstFrame) {
initReflections();
isFirstFrame = false;
}
if (ambientCache) if (ambientCache)
ambientCache->processQueue(); ambientCache->processQueue();