- Add new 'Advanced graphic' menu config
- update salty/CMakeLists.txt for removed changes.txt git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4717 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 08d6da78839969dcd128ecdf3cf664cfffca6d75 Former-commit-id: a708037a94ef3a0b42b4f8ab13798fc9fd9ab1c7
This commit is contained in:
torcs-ng
parent
dd332e7255
commit
28c04a5a38
5 changed files with 39 additions and 10 deletions
|
|
@ -69,12 +69,22 @@
|
|||
#define GR_ATT_DYNAMICSKYDOME_ENABLED "enabled"
|
||||
#define GR_ATT_DYNAMICSKYDOME_DISABLED "disabled"
|
||||
#define GR_ATT_PRECIPDENSITY "precipitation density"
|
||||
#define GR_ATT_BGSKY "background skydome"
|
||||
#define GR_ATT_BGSKY_ENABLED "enabled"
|
||||
#define GR_ATT_BGSKY "background skydome"
|
||||
#define GR_ATT_BGSKY_RING "background"
|
||||
#define GR_ATT_BGSKY_LAND "land"
|
||||
#define GR_ATT_BGSKY_DISABLED "disabled"
|
||||
#define GR_ATT_CLOUDLAYER "cloudlayer"
|
||||
#define GR_ATT_AGR_FOREST "forest LOD"
|
||||
#define GR_ATT_AGR_TREE "tree LOD"
|
||||
#define GR_ATT_AGR_PARKING "parking LOD"
|
||||
//#define GR_ATT_DYNAMICWEATHER "dynamic weather"
|
||||
|
||||
#define GR_ATT_AGR_NULL "none"
|
||||
#define GR_ATT_AGR_LITTLE "little"
|
||||
#define GR_ATT_AGR_MEDIUM "medium"
|
||||
#define GR_ATT_AGR_FULL "full"
|
||||
#define GR_ATT_AGR_HIGH "high"
|
||||
|
||||
#define GR_ATT_NB_SCREENS "number of screens"
|
||||
#define GR_ATT_ARR_SCREENS "arrangement of screens"
|
||||
#define GR_ATT_CUR_DRV "current driver"
|
||||
|
|
|
|||
|
|
@ -15,29 +15,30 @@ ENDIF(WIN32)
|
|||
SET(CS confscreens)
|
||||
SET(CONFSCREENS_SOURCES ${CS}/playerconfig.cpp ${CS}/controlconfig.cpp
|
||||
${CS}/joystickconfig.cpp ${CS}/mouseconfig.cpp
|
||||
${CS}/joy2butconfig.cpp
|
||||
${CS}/joy2butconfig.cpp
|
||||
${CS}/displayconfig.cpp ${CS}/graphconfig.cpp ${CS}/openglconfig.cpp
|
||||
${CS}/monitorconfig.cpp
|
||||
${CS}/monitorconfig.cpp ${CS}/advancedgraphconfig.cpp
|
||||
${CS}/simuconfig.cpp ${CS}/soundconfig.cpp ${CS}/aiconfig.cpp
|
||||
${CS}/carsettingsmenu.cpp ${CS}/hostsettingsmenu.cpp
|
||||
${CS}/confscreens.h
|
||||
${CS}/confscreens.h ${CS}/advancedgraphconfig.h
|
||||
${CS}/playerconfig.h ${CS}/controlconfig.h
|
||||
${CS}/joystickconfig.h ${CS}/mouseconfig.h
|
||||
${CS}/joy2butconfig.h
|
||||
${CS}/joystickconfig.h ${CS}/mouseconfig.h
|
||||
${CS}/joy2butconfig.h ${CS}/
|
||||
${CS}/displayconfig.h ${CS}/graphconfig.h ${CS}/openglconfig.h
|
||||
${CS}/simuconfig.h ${CS}/soundconfig.h ${CS}/aiconfig.h
|
||||
${CS}/carsettingsmenu.h ${CS}/hostsettingsmenu.h)
|
||||
|
||||
SET(RS racescreens)
|
||||
SET(RACESCREENS_SOURCES ${RS}/raceselectmenu.cpp
|
||||
${RS}/raceweekendmenu.cpp
|
||||
${RS}/racemanmenu.cpp ${RS}/fileselect.cpp ${RS}/networkingmenu.cpp
|
||||
${RS}/raceconfigstate.cpp
|
||||
${RS}/trackselect.cpp ${RS}/driverselect.cpp ${RS}/garagemenu.cpp
|
||||
${RS}/raceparamsmenu.cpp
|
||||
${RS}/raceloadingmenu.cpp ${RS}/racerunningmenus.cpp
|
||||
${RS}/raceloadingmenu.cpp ${RS}/racerunningmenus.cpp
|
||||
${RS}/racestopmenu.cpp ${RS}/racestartmenu.cpp ${RS}/racepitmenu.cpp
|
||||
${RS}/raceresultsmenus.cpp ${RS}/racenexteventmenu.cpp
|
||||
${RS}/racescreens.h ${RS}/garagemenu.h)
|
||||
${RS}/racescreens.h ${RS}/garagemenu.h ${RS}/raceweekendscreens.h)
|
||||
|
||||
SET(LEGACYMENU_SOURCES ${MAINSCREENS_SOURCES}
|
||||
${CONFSCREENS_SOURCES}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ static const int PrecipDensityValues[] = {0, 20, 40, 60, 80, 100};
|
|||
static const int NbPrecipDensityValues = sizeof(PrecipDensityValues) / sizeof(PrecipDensityValues[0]);
|
||||
static const int CloudLayersValues[] = {1, 2, 3};
|
||||
static const int NbCloudLayersValues = sizeof(CloudLayersValues) / sizeof(CloudLayersValues[0]);
|
||||
static const char* BackgroundLandscapeValues[] = { GR_ATT_BGSKY_DISABLED, GR_ATT_BGSKY_ENABLED };
|
||||
static const char* BackgroundLandscapeValues[] = { GR_ATT_BGSKY_DISABLED, GR_ATT_BGSKY_RING, GR_ATT_BGSKY_LAND };
|
||||
static const int NbBackgroundLandscapeValues = sizeof(BackgroundLandscapeValues) / sizeof(BackgroundLandscapeValues[0]);
|
||||
|
||||
static void *ScrHandle = NULL;
|
||||
|
|
|
|||
|
|
@ -47,6 +47,12 @@ onRaceSelectMenuActivate(void * /* dummy */)
|
|||
GfuiScreenActivate(RmRaceSelectInit(MenuHandle));
|
||||
}
|
||||
|
||||
static void
|
||||
onRaceWESelectMenuActivate(void * /* dummy */)
|
||||
{
|
||||
GfuiScreenActivate(RmRaceWESelectInit(MenuHandle));
|
||||
}
|
||||
|
||||
static void
|
||||
onOptionsMenuActivate(void * /* dummy */)
|
||||
{
|
||||
|
|
@ -105,6 +111,7 @@ MainMenuInit(void)
|
|||
|
||||
//Add buttons and create based on xml
|
||||
GfuiMenuCreateButtonControl(MenuHandle, menuDescHdle, "race", NULL, onRaceSelectMenuActivate);
|
||||
GfuiMenuCreateButtonControl(MenuHandle, menuDescHdle, "weekend", NULL, onRaceWESelectMenuActivate);
|
||||
GfuiMenuCreateButtonControl(MenuHandle, menuDescHdle, "configure", NULL, onPlayerConfigMenuActivate);
|
||||
GfuiMenuCreateButtonControl(MenuHandle, menuDescHdle, "options", NULL, onOptionsMenuActivate);
|
||||
GfuiMenuCreateButtonControl(MenuHandle, menuDescHdle, "credits", NULL, onCreditsMenuActivate);
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
#include <displayconfig.h>
|
||||
#include <monitorconfig.h>
|
||||
#include <graphconfig.h>
|
||||
#include <advancedgraphconfig.h>
|
||||
#include <openglconfig.h>
|
||||
#include <soundconfig.h>
|
||||
#include <simuconfig.h>
|
||||
|
|
@ -51,6 +52,12 @@ onGraphMenuActivate(void * /* dummy */)
|
|||
GfuiScreenActivate(GraphMenuInit(MenuHandle));
|
||||
}
|
||||
|
||||
static void
|
||||
onAdvancedGraphMenuActivate(void * /*dummy */)
|
||||
{
|
||||
GfuiScreenActivate(AdvancedGraphMenuInit(MenuHandle));
|
||||
}
|
||||
|
||||
static void
|
||||
onOpenGLMenuActivate(void * /* dummy */)
|
||||
{
|
||||
|
|
@ -93,6 +100,10 @@ OptionsMenuInit(void *prevMenu)
|
|||
GfuiMenuCreateButtonControl(MenuHandle, param, "display", NULL, onDisplayMenuActivate);
|
||||
#endif
|
||||
GfuiMenuCreateButtonControl(MenuHandle, param, "graphic", NULL, onGraphMenuActivate);
|
||||
//#if _ADVANCED // CMAKE OPTION ADVANCED
|
||||
GfuiMenuCreateButtonControl(MenuHandle, param, "advanced", NULL, onAdvancedGraphMenuActivate);
|
||||
//#endif
|
||||
|
||||
GfuiMenuCreateButtonControl(MenuHandle, param, "opengl", NULL, onOpenGLMenuActivate);
|
||||
GfuiMenuCreateButtonControl(MenuHandle, param, "sound", NULL, onSoundMenuActivate);
|
||||
GfuiMenuCreateButtonControl(MenuHandle, param, "simulation", NULL, onSimuMenuActivate);
|
||||
|
|
|
|||
Loading…
Reference in a new issue