Merge pull request #789 from erorcun/master

rewrite CFO + postfx/pipeline options
This commit is contained in:
erorcun 2020-11-03 01:43:53 +03:00 committed by GitHub
commit 770a1f8012
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 1175 additions and 887 deletions

View file

@ -64,6 +64,7 @@
#include "debugmenu.h"
#include "Clock.h"
#include "custompipes.h"
#include "frontendoption.h"
GlobalScene Scene;
@ -404,6 +405,13 @@ Initialise3D(void *param)
DebugMenuInit();
DebugMenuPopulate();
#endif // !DEBUGMENU
#ifdef CUSTOM_FRONTEND_OPTIONS
// Apparently this func. can be run multiple times at the start.
if (numCustomFrontendOptions == 0 && numCustomFrontendScreens == 0) {
// needs stored language and TheText to be loaded, and last TheText reload is at the start of here
CustomFrontendOptionsPopulate();
}
#endif
bool ret = CGame::InitialiseRenderWare();
#ifdef EXTENDED_PIPELINES
CustomPipes::CustomPipeInit(); // need Scene.world for this