zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-21 19:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- menu system update from Raze for better control of animated menus.

Browse source
This commit is contained in:
Christoph Oelckers 2021-09-18 12:19:35 +02:00
parent 31de21e6aa
commit fc2818b195
7 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/menu/menu.cpp
View file

@ -1036,6 +1036,7 @@ DEFINE_FIELD(DListMenuDescriptor, mFont)
DEFINE_FIELD(DListMenuDescriptor, mFontColor)
DEFINE_FIELD(DListMenuDescriptor, mFontColor2)
DEFINE_FIELD(DListMenuDescriptor, mAnimatedTransition)
DEFINE_FIELD(DListMenuDescriptor, mAnimated)
DEFINE_FIELD(DListMenuDescriptor, mCenter)
DEFINE_FIELD(DListMenuDescriptor, mVirtWidth)
DEFINE_FIELD(DListMenuDescriptor, mVirtHeight)
@ -1066,6 +1067,7 @@ DEFINE_FIELD(DImageScrollerDescriptor, textBackgroundBrightness)
DEFINE_FIELD(DImageScrollerDescriptor,textFont)
DEFINE_FIELD(DImageScrollerDescriptor, textScale)
DEFINE_FIELD(DImageScrollerDescriptor, mAnimatedTransition)
DEFINE_FIELD(DImageScrollerDescriptor, mAnimated)
DEFINE_FIELD(DImageScrollerDescriptor, virtWidth)
DEFINE_FIELD(DImageScrollerDescriptor, virtHeight)

1
src/common/menu/menu.h
View file

@ -141,6 +141,7 @@ public:
FFont *textFont;
double textScale;
bool mAnimatedTransition;
bool mAnimated;
int virtWidth, virtHeight;
};

8
src/common/menu/menudef.cpp
View file

@ -344,6 +344,10 @@ static void DoParseListMenuBody(FScanner &sc, DListMenuDescriptor *desc, bool &s
{
desc->mAnimatedTransition = true;
}
else if (sc.Compare("animated"))
{
desc->mAnimated = true;
}
else if (sc.Compare("MouseWindow"))
{
sc.MustGetNumber();
@ -1212,6 +1216,10 @@ static void ParseImageScrollerBody(FScanner& sc, DImageScrollerDescriptor* desc)
{
desc->mAnimatedTransition = true;
}
else if (sc.Compare("animated"))
{
desc->mAnimated = true;
}
else if (sc.Compare("textBackground"))
{
sc.MustGetString();

2
wadsrc/static/shaders/glsl/main.fp
View file

@ -570,7 +570,7 @@ void SetMaterialProps(inout Material material, vec2 texCoord)
if ((uTextureMode & TEXF_Detailmap) != 0)
{
vec4 Detail = texture(detailtexture, texCoord.st * uDetailParms.xy) * uDetailParms.z;
material.Base *= Detail;
material.Base.rgb *= Detail.rgb;
}
if ((uTextureMode & TEXF_Glowmap) != 0)

1
wadsrc/static/zscript/engine/base.zs
View file

@ -439,6 +439,7 @@ struct Font native
enum EColorRange
{
CR_UNDEFINED = -1,
CR_NATIVEPAL = -1,
CR_BRICK,
CR_TAN,
CR_GRAY,

5
wadsrc/static/zscript/engine/ui/menu/imagescroller.zs
View file

@ -40,6 +40,7 @@ class ImageScrollerDescriptor : MenuDescriptor native
native Color textBackgroundBrightness;
native double textScale;
native bool mAnimatedTransition;
native bool mAnimated;
native int virtWidth, virtHeight;
}
@ -168,6 +169,7 @@ class ImageScrollerMenu : Menu
index = 0;
mDesc = desc;
AnimatedTransition = desc.mAnimatedTransition;
Animated = desc.mAnimated;
current = mDesc.mItems[0];
current.onStartPage();
previous = null;
@ -273,11 +275,12 @@ class ImageScrollerMenu : Menu
{
if (previous != null)
{
bool wasAnimated = Animated;
Animated = true;
if (DrawTransition()) return;
previous = null;
Animated = wasAnimated;
}
current.Drawer(false);
Animated = false;
}
}

4
wadsrc/static/zscript/engine/ui/menu/listmenu.zs
View file

@ -56,6 +56,7 @@ class ListMenuDescriptor : MenuDescriptor native
native int mFontColor2;
native bool mCenter;
native bool mAnimatedTransition;
native bool mAnimated;
native int mVirtWidth, mVirtHeight;
native void Reset();
@ -87,6 +88,7 @@ class ListMenu : Menu
Super.Init(parent);
mDesc = desc;
AnimatedTransition = mDesc.mAnimatedTransition;
Animated = mDesc.mAnimated;
if (desc.mCenter)
{
double center = 160;
@ -258,7 +260,7 @@ class ListMenu : Menu
{
for(int i=0;i<mDesc.mItems.Size(); i++)
{
if (mDesc.mItems[i].CheckCoordinate(x, y))
if (mDesc.mItems[i].Selectable() && mDesc.mItems[i].CheckCoordinate(x, y))
{
if (i != mDesc.mSelectedItem)
{