mirror of
https://github.com/FunKey-Project/RetroFE.git
synced 2026-01-03 04:28:51 +01:00
Added vertical menu generation, updated layout example. Removed 4x3 layout.
This commit is contained in:
emb
parent
411342dfab
commit
2cebd45f87
@ -7,14 +7,40 @@
|
||||
<sound type="highlight" src="highlight.wav" />
|
||||
<sound type="select" src="select.wav" />
|
||||
|
||||
<!-- border for game name (in menu) -->
|
||||
<container backgroundColor="222222" backgroundAlpha="99" x="0" y="bottom" yOrigin="center" yOffset="-175" height="150" width="stretch" layer="1" alpha="0.3" />
|
||||
<reloadableText type="title" x="0" y="bottom" xOffset="20" yOrigin="center" yOffset="-175" height="150" width="stretch" layer="1" fontSize="50">
|
||||
<onHighlightEnter>
|
||||
<set duration=".2">
|
||||
<animate type="x" from="right" to="0" algorithm="easeinquadratic"/>
|
||||
<animate type="xOrigin" from="right" to="left" algorithm="easeinquadratic"/>
|
||||
</set>
|
||||
</onHighlightEnter>
|
||||
<onHighlightExit>
|
||||
<set duration=".2">
|
||||
<animate type="x" from="0" to="left" algorithm="easeinquadratic"/>
|
||||
<animate type="xOrigin" from="left" to="right" algorithm="easeinquadratic"/>
|
||||
</set>
|
||||
</onHighlightExit>
|
||||
</reloadableText>
|
||||
<!--
|
||||
<reloadableText type="manufacturer" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-10" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
|
||||
<reloadableText type="year" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-30" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
<reloadableText type="numberPlayers" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-70" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
|
||||
<reloadableText type="numberButtons" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-90" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
-->
|
||||
|
||||
<menu imageType="title" algorithm="easeincircular" x="0" y="bottom" yOrigin="center" yOffset="-175" height="125" speed="0.05" acceleration="0.05" height="25">
|
||||
<!-- todo: the menu does not support the standard onEnter onExit, onHighlightEnter onHighlightExit tags like the rest of the system does. -->
|
||||
|
||||
<item x="0" xOrigin="right" xOffset="-1" layer="3" fontSize="50" alpha="0" />
|
||||
<item x="100" xOrigin="left" layer="4" fontSize="50" alpha="1" selected="true"/>
|
||||
<item x="right" xOrigin="left" xOffset="1" layer="3" fontSize="50" alpha="0" />
|
||||
<menu orientation="horizontal" imageType="title" algorithm="easeincircular" x="100" y="100" height="700" speed="0.05" acceleration="0.05">
|
||||
<itemDefaults height="50" spacing="10" alpha="0.5" xOffset="20" yOrigin="center" />
|
||||
<item index="start" height="0" spacing="0" alpha="0"/>
|
||||
<item index="2" spacing="0" height="100" fontSize="100" alpha="1" selected="true"/>
|
||||
<item index="end" height="0" spacing="0" alpha="0"/>
|
||||
</menu>
|
||||
|
||||
<image x="30" y="20" height="80" src="logo.png" layer="1" alpha="0.3">
|
||||
@ -32,26 +58,10 @@
|
||||
</set>
|
||||
</onExit>
|
||||
</image>
|
||||
|
||||
<reloadableText type="manufacturer" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-10" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
|
||||
<reloadableText type="year" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-30" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
|
||||
<reloadableText type="title" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-50" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
<!--
|
||||
<reloadableText type="numberPlayers" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-70" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
|
||||
<reloadableText type="numberButtons" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-90" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
-->
|
||||
|
||||
<reloadableVideo imageType="snap" x="0" y="0" width="stretch" height="stretch" fontSize="20" layer="0">
|
||||
<onHighlightEnter>
|
||||
<set duration=".2">
|
||||
<set duration=".4">
|
||||
<animate type="alpha" from="0" to="1" algorithm="easeinquadratic"/>
|
||||
</set>
|
||||
</onHighlightEnter>
|
||||
@ -62,8 +72,6 @@
|
||||
</onHighlightExit>
|
||||
|
||||
</reloadableVideo>
|
||||
|
||||
<text value="RetroFE Beta - For test purposes only" fontSize="20" x="right" y="bottom" xOrigin="right" yOrigin="bottom" xOffset="-10" yOffset="-10" />
|
||||
</layout>
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
@ -1,90 +0,0 @@
|
||||
<!-- todo: add collection name text tag, metadata tags -->
|
||||
<!-- todo: collection name text tag will load image, or text if image does not exist -->
|
||||
|
||||
<layout width="1024" height="768" font="Age.otf" fontColor="ecf0f1">
|
||||
<sound type="load" src="load.wav" />
|
||||
<sound type="unload" src="unload.wav" />
|
||||
<sound type="highlight" src="highlight.wav" />
|
||||
<sound type="select" src="select.wav" />
|
||||
|
||||
<menu imageType="title" algorithm="easeincircular" x="center" y="center" xOrigin="center" yOrigin="center" speed="0.05" acceleration="0.05" height="25">
|
||||
<!-- todo: the menu does not support the standard onEnter onExit, onHighlightEnter onHighlightExit tags like the rest of the system does. -->
|
||||
|
||||
<item xOffset="-100" yOffset="-120" layer="1" fontSize="5" height="15" alpha="0" />
|
||||
<item xOffset="-250" yOffset="-80" layer="2" fontSize="7" height="20" alpha="0.1"/>
|
||||
<item xOffset="-400" yOffset="0" layer="3" fontSize="10" height="30" alpha="0.25"/>
|
||||
<item xOffset="-300" yOffset="133" layer="4" fontSize="20" height="60" alpha="0.5"/>
|
||||
<item xOffset="0" yOffset="175" layer="5" fontSize="40" height="150" alpha="1" selected="true" />
|
||||
<item xOffset="300" yOffset="133" layer="4" fontSize="20" height="60" alpha="0.5"/>
|
||||
<item xOffset="400" yOffset="0" layer="3" fontSize="10" height="30" alpha="0.25"/>
|
||||
<item xOffset="250" yOffset="-80" layer="2" fontSize="7" height="15" alpha="0.1"/>
|
||||
<item xOffset="100" yOffset="-120" layer="1" fontSize="5" height="0" alpha="0"/>
|
||||
</menu>
|
||||
|
||||
<image x="center" y="center" height="stretch" width="stretch" xOrigin="center" yOrigin="center" src="background.png" layer="0" alpha="0.5"/>
|
||||
|
||||
<image x="30" y="20" height="50" src="logo.png" layer="1" alpha="0.3">
|
||||
<onEnter>
|
||||
<set duration=".5">
|
||||
<animate type="y" from="top" to="20" algorithm="easeinquadratic"/>
|
||||
<animate type="yOrigin" from="bottom" to="top" algorithm="easeincircular"/>
|
||||
</set>
|
||||
</onEnter>
|
||||
|
||||
<onExit>
|
||||
<set duration=".25">
|
||||
<animate type="y" from="20" to="top" algorithm="easeinquadratic"/>
|
||||
<animate type="yOrigin" from="top" to="bottom" algorithm="easeincircular"/>
|
||||
</set>
|
||||
</onExit>
|
||||
</image>
|
||||
|
||||
<reloadableText type="manufacturer" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-10" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
|
||||
<reloadableText type="year" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-30" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
|
||||
<reloadableText type="title" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-50" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
<!--
|
||||
<reloadableText type="numberPlayers" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-70" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
|
||||
<reloadableText type="numberButtons" x="left" y="bottom" xOrigin="left" yOrigin="bottom" xOffset="10" yOffset="-90" fontSize="20" layer="0">
|
||||
</reloadableText>
|
||||
-->
|
||||
<reloadableVideo imageType="snap" x="center" xOrigin="center" yOrigin="top" fontSize="20" height="240" layer="0">
|
||||
<onHighlightEnter>
|
||||
<set duration=".2">
|
||||
<animate type="y" from="bottom" to="100" algorithm="easeinoutquadratic"/>
|
||||
<animate type="width" from="0" to="200" algorithm="easeoutquadratic"/>
|
||||
<animate type="alpha" from="0" to="0.5" algorithm="easeinquadratic"/>
|
||||
</set>
|
||||
<set duration=".2">
|
||||
<animate type="y" from="100" to="130" algorithm="easeinoutquadratic"/>
|
||||
<animate type="width" from="200" to="320" algorithm="easeoutquadratic"/>
|
||||
<animate type="alpha" from=".5" to="0.75" algorithm="easeinquadratic"/>
|
||||
</set>
|
||||
</onHighlightEnter>
|
||||
<onHighlightExit>
|
||||
<set duration=".2">
|
||||
<animate type="y" to="100" from="130" algorithm="easeinoutquadratic"/>
|
||||
<animate type="width" to="200" from="320" algorithm="easeoutquadratic"/>
|
||||
<animate type="alpha" from=".75" to="0.5" algorithm="easeinquadratic"/>
|
||||
</set>
|
||||
<set duration=".2">
|
||||
<animate type="y" to="bottom" from="100" algorithm="easeinoutquadratic"/>
|
||||
<animate type="width" to="0" from="200" algorithm="easeoutquadratic"/>
|
||||
<animate type="alpha" to="0.5" from="0" algorithm="easeinquadratic"/>
|
||||
</set>
|
||||
</onHighlightExit>
|
||||
|
||||
</reloadableVideo>
|
||||
|
||||
<text value="RetroFE Beta - For test purposes only" fontSize="20" x="right" y="bottom" xOrigin="right" yOrigin="bottom" xOffset="-10" yOffset="-10" />
|
||||
</layout>
|
||||
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 MiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 8.8 KiB |
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 208 B |
Binary file not shown.
@ -26,7 +26,7 @@
|
||||
|
||||
using namespace rapidxml;
|
||||
|
||||
|
||||
//todo: this file is starting to become a god class of building. Consider splitting into sub-builders
|
||||
PageBuilder::PageBuilder(std::string layoutKey, std::string collection, Configuration &c, FontCache *fc)
|
||||
: LayoutKey(layoutKey)
|
||||
, Collection(collection)
|
||||
@ -294,7 +294,7 @@ bool PageBuilder::BuildComponents(xml_node<> *layout, Page *page)
|
||||
return false;
|
||||
}
|
||||
|
||||
ScrollingList *scrollingList = BuildCustomMenu(menuXml);
|
||||
ScrollingList *scrollingList = BuildMenu(menuXml);
|
||||
page->SetMenu(scrollingList);
|
||||
|
||||
for(xml_node<> *componentXml = layout->first_node("container"); componentXml; componentXml = componentXml->next_sibling("container"))
|
||||
@ -454,31 +454,63 @@ void PageBuilder::LoadTweens(Component *c, xml_node<> *componentXml)
|
||||
}
|
||||
|
||||
|
||||
ScrollingList * PageBuilder::BuildCustomMenu(xml_node<> *menuXml)
|
||||
ScrollingList * PageBuilder::BuildMenu(xml_node<> *menuXml)
|
||||
{
|
||||
ScrollingList *menu = NULL;
|
||||
std::string imageType="null";
|
||||
|
||||
std::string menuType = "vertical";
|
||||
std::string imageType = "null";
|
||||
std::map<int, xml_node<> *> overrideItems;
|
||||
xml_node<> *itemDefaults = menuXml->first_node("itemDefaults");
|
||||
xml_attribute<> *imageTypeXml = menuXml->first_attribute("imageType");
|
||||
xml_attribute<> *menuTypeXml = menuXml->first_attribute("type");
|
||||
|
||||
if(menuTypeXml)
|
||||
{
|
||||
menuType = menuTypeXml->value();
|
||||
}
|
||||
|
||||
// ensure <menu> has an <itemDefaults> tag
|
||||
if(!itemDefaults)
|
||||
{
|
||||
Logger::Write(Logger::ZONE_WARNING, "Layout", "Menu tag is missing <itemDefaults> tag.");
|
||||
}
|
||||
|
||||
if(imageTypeXml)
|
||||
{
|
||||
imageType = imageTypeXml->value();
|
||||
}
|
||||
|
||||
// on default, text will be rendered to the menu. Preload it into cache.
|
||||
FC->LoadFont(Font, FontColor);
|
||||
|
||||
menu = new ScrollingList(Config, ScaleX, ScaleY, FC->GetFont(Font), FontColor, LayoutKey, Collection, imageType);
|
||||
|
||||
ViewInfo *v = menu->GetBaseViewInfo();
|
||||
BuildViewInfo(menuXml, v);
|
||||
|
||||
if(menuType == "custom")
|
||||
{
|
||||
BuildCustomMenu(menu, menuXml, itemDefaults);
|
||||
}
|
||||
else
|
||||
{
|
||||
BuildVerticalMenu(menu, menuXml, itemDefaults);
|
||||
}
|
||||
|
||||
return menu;
|
||||
}
|
||||
|
||||
|
||||
void PageBuilder::BuildCustomMenu(ScrollingList *menu, xml_node<> *menuXml, xml_node<> *itemDefaults)
|
||||
{
|
||||
std::vector<ViewInfo *> *points = new std::vector<ViewInfo *>();
|
||||
|
||||
/*
|
||||
int i = 0;
|
||||
|
||||
for(xml_node<> *componentXml = menuXml->first_node("item"); componentXml; componentXml = componentXml->next_sibling("item"))
|
||||
{
|
||||
ViewInfo *viewInfo = new ViewInfo();
|
||||
BuildViewInfo(componentXml, viewInfo);
|
||||
BuildViewInfo(componentXml, viewInfo, itemDefaults);
|
||||
|
||||
points->push_back(viewInfo);
|
||||
|
||||
@ -491,59 +523,50 @@ ScrollingList * PageBuilder::BuildCustomMenu(xml_node<> *menuXml)
|
||||
|
||||
i++;
|
||||
}
|
||||
*/
|
||||
|
||||
int selectedIndex = 0;
|
||||
menu->SetPoints(points);
|
||||
}
|
||||
|
||||
void PageBuilder::BuildVerticalMenu(ScrollingList *menu, xml_node<> *menuXml, xml_node<> *itemDefaults)
|
||||
{
|
||||
std::vector<ViewInfo *> *points = new std::vector<ViewInfo *>();
|
||||
|
||||
int selectedIndex = MENU_FIRST;
|
||||
std::map<int, xml_node<> *> overrideItems;
|
||||
|
||||
xml_node<> *itemDefaults = menuXml->first_node("itemDefaults");
|
||||
|
||||
// By default the menu will automatically determine the offsets for your list items.
|
||||
// We can override individual menu points to have unique characteristics (i.e. make the first item opaque or
|
||||
// make the selected item a different color).
|
||||
for(xml_node<> *componentXml = menuXml->first_node("item"); componentXml; componentXml = componentXml->next_sibling("item"))
|
||||
{
|
||||
xml_attribute<> *xmlIndex = componentXml->first_attribute("index");
|
||||
|
||||
if(xmlIndex)
|
||||
{
|
||||
int index = 0;
|
||||
std::string strIndex(xmlIndex->value());
|
||||
if(strIndex == "end")
|
||||
{
|
||||
index = -2;
|
||||
}
|
||||
else if(strIndex == "last")
|
||||
{
|
||||
index = -3;
|
||||
}
|
||||
else if(strIndex == "start")
|
||||
{
|
||||
index = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
index = Utils::ConvertInt(xmlIndex->value());
|
||||
}
|
||||
|
||||
overrideItems[index] = componentXml;
|
||||
int itemIndex = ParseMenuPosition(xmlIndex->value());
|
||||
overrideItems[itemIndex] = componentXml;
|
||||
|
||||
// check to see if the item specified is the selected index
|
||||
xml_attribute<> *xmlSelectedIndex = componentXml->first_attribute("selected");
|
||||
|
||||
if(xmlSelectedIndex)
|
||||
{
|
||||
selectedIndex = index + 1; // add one to account for the "hidden menu item
|
||||
selectedIndex = itemIndex;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
float height = 0;
|
||||
int index = 0;
|
||||
bool end = false;
|
||||
|
||||
//menu start
|
||||
if(overrideItems.find(-1) != overrideItems.end())
|
||||
|
||||
float height = 0;
|
||||
int index = 0;
|
||||
|
||||
if(overrideItems.find(MENU_START) != overrideItems.end())
|
||||
{
|
||||
ViewInfo *viewInfo = new ViewInfo();
|
||||
xml_node<> *component = overrideItems[-1];
|
||||
BuildViewInfo(component, viewInfo, itemDefaults);
|
||||
viewInfo->SetY(v->GetY() + (float)height);
|
||||
xml_node<> *component = overrideItems[MENU_START];
|
||||
ViewInfo *viewInfo = CreateMenuItemInfo(component, itemDefaults, menu->GetBaseViewInfo()->GetY() + height);
|
||||
points->push_back(viewInfo);
|
||||
}
|
||||
while(!end)
|
||||
@ -551,58 +574,100 @@ ScrollingList * PageBuilder::BuildCustomMenu(xml_node<> *menuXml)
|
||||
ViewInfo *viewInfo = new ViewInfo();
|
||||
xml_node<> *component = itemDefaults;
|
||||
|
||||
// uss overridden item setting if specified by layout for the given index
|
||||
if(overrideItems.find(index) != overrideItems.end())
|
||||
{
|
||||
component = overrideItems[index];
|
||||
}
|
||||
|
||||
xml_attribute<> *itemSpacing = component->first_attribute("spacing");
|
||||
// calculate the total height of our menu items if we can load any additional items
|
||||
BuildViewInfo(component, viewInfo, itemDefaults);
|
||||
float nextHeight = height + (viewInfo->GetHeight() + ((itemSpacing) ? Utils::ConvertInt(itemSpacing->value()) : 0));
|
||||
xml_attribute<> *itemSpacingXml = component->first_attribute("spacing");
|
||||
int itemSpacing = itemSpacingXml ? Utils::ConvertInt(itemSpacingXml->value()) : 0;
|
||||
float nextHeight = height + viewInfo->GetHeight() + itemSpacing;
|
||||
|
||||
if(nextHeight >= v->GetHeight())
|
||||
if(nextHeight >= menu->GetBaseViewInfo()->GetHeight())
|
||||
{
|
||||
end = true;
|
||||
// last item to render?
|
||||
if(overrideItems.find(-3) != overrideItems.end())
|
||||
{
|
||||
component = overrideItems[-3];
|
||||
BuildViewInfo(component, viewInfo, itemDefaults);
|
||||
itemSpacing = component->first_attribute("spacing");
|
||||
nextHeight = height + (viewInfo->GetHeight() + ((itemSpacing) ? Utils::ConvertInt(itemSpacing->value()) : 0));
|
||||
}
|
||||
}
|
||||
|
||||
// we have reached the last menuitem
|
||||
if(end && overrideItems.find(MENU_LAST) != overrideItems.end())
|
||||
{
|
||||
component = overrideItems[MENU_LAST];
|
||||
|
||||
BuildViewInfo(component, viewInfo, itemDefaults);
|
||||
xml_attribute<> *itemSpacingXml = component->first_attribute("spacing");
|
||||
int itemSpacing = itemSpacingXml ? Utils::ConvertInt(itemSpacingXml->value()) : 0;
|
||||
nextHeight = height + viewInfo->GetHeight() + itemSpacing;
|
||||
}
|
||||
|
||||
height = nextHeight;
|
||||
viewInfo->SetY(v->GetY() + (float)height);
|
||||
viewInfo->SetY(menu->GetBaseViewInfo()->GetY() + (float)height);
|
||||
points->push_back(viewInfo);
|
||||
index++;
|
||||
}
|
||||
|
||||
//menu end
|
||||
if(overrideItems.find(-2) != overrideItems.end())
|
||||
if(overrideItems.find(MENU_END) != overrideItems.end())
|
||||
{
|
||||
ViewInfo *viewInfo = new ViewInfo();
|
||||
xml_node<> *component = overrideItems[-2];
|
||||
BuildViewInfo(component, viewInfo, itemDefaults);
|
||||
viewInfo->SetY(v->GetY() + (float)height);
|
||||
xml_node<> *component = overrideItems[MENU_END];
|
||||
ViewInfo *viewInfo = CreateMenuItemInfo(component, itemDefaults, menu->GetBaseViewInfo()->GetY() + height);
|
||||
points->push_back(viewInfo);
|
||||
}
|
||||
|
||||
menu->SetSelectedIndex(selectedIndex);
|
||||
if(selectedIndex >= ((int)points->size()-2))
|
||||
{
|
||||
//todo: print debug statements when out of range
|
||||
selectedIndex = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
menu->SetSelectedIndex(selectedIndex+1);
|
||||
}
|
||||
|
||||
menu->SetPoints(points);
|
||||
}
|
||||
|
||||
ViewInfo *PageBuilder::CreateMenuItemInfo(xml_node<> *component, xml_node<> *defaults, float y)
|
||||
{
|
||||
ViewInfo *viewInfo = new ViewInfo();
|
||||
BuildViewInfo(component, viewInfo, defaults);
|
||||
viewInfo->SetY(y);
|
||||
return viewInfo;
|
||||
}
|
||||
|
||||
return menu;
|
||||
int PageBuilder::ParseMenuPosition(std::string strIndex)
|
||||
{
|
||||
int index = MENU_FIRST;
|
||||
|
||||
if(strIndex == "end") {
|
||||
index = MENU_END;
|
||||
}
|
||||
else if(strIndex == "last")
|
||||
{
|
||||
index = MENU_LAST;
|
||||
}
|
||||
else if(strIndex == "start")
|
||||
{
|
||||
index = MENU_START;
|
||||
}
|
||||
else if(strIndex == "first")
|
||||
{
|
||||
index = MENU_FIRST;
|
||||
}
|
||||
else
|
||||
{
|
||||
index = Utils::ConvertInt(strIndex);
|
||||
}
|
||||
return index;
|
||||
}
|
||||
|
||||
xml_attribute<> *PageBuilder::FindAttribute(xml_node<> *componentXml, std::string attribute, xml_node<> *defaultXml = NULL)
|
||||
{
|
||||
if(!defaultXml) { return FindRecursiveAttribute(componentXml, attribute); }
|
||||
|
||||
xml_attribute<> *attributeXml = componentXml->first_attribute(attribute.c_str());
|
||||
|
||||
if(!attributeXml)
|
||||
if(!attributeXml && defaultXml)
|
||||
{
|
||||
attributeXml = defaultXml->first_attribute(attribute.c_str());
|
||||
}
|
||||
@ -610,26 +675,6 @@ xml_attribute<> *PageBuilder::FindAttribute(xml_node<> *componentXml, std::strin
|
||||
return attributeXml;
|
||||
}
|
||||
|
||||
xml_attribute<> *PageBuilder::FindRecursiveAttribute(xml_node<> *componentXml, std::string attribute)
|
||||
{
|
||||
|
||||
xml_attribute<> *attributeXml = NULL;
|
||||
xml_node<> *parent = componentXml->parent();
|
||||
|
||||
// root xml node height and width attributes are to define the layout size itself, not the elements
|
||||
if(parent && parent->parent())
|
||||
{
|
||||
attributeXml = componentXml->first_attribute(attribute.c_str());
|
||||
|
||||
if(!attributeXml)
|
||||
{
|
||||
attributeXml = FindRecursiveAttribute(parent, attribute);
|
||||
}
|
||||
}
|
||||
|
||||
return attributeXml;
|
||||
}
|
||||
|
||||
void PageBuilder::BuildViewInfo(xml_node<> *componentXml, ViewInfo *info, xml_node<> *defaultXml)
|
||||
{
|
||||
xml_attribute<> *x = FindAttribute(componentXml, "x", defaultXml);
|
||||
|
||||
@ -41,8 +41,12 @@ private:
|
||||
void BuildViewInfo(rapidxml::xml_node<> *componentXml, ViewInfo *info, rapidxml::xml_node<> *defaultXml = NULL);
|
||||
bool BuildComponents(rapidxml::xml_node<> *layout, Page *page);
|
||||
void LoadTweens(Component *c, rapidxml::xml_node<> *componentXml);
|
||||
ScrollingList * BuildCustomMenu(rapidxml::xml_node<> *menuXml);
|
||||
rapidxml::xml_attribute<> *FindRecursiveAttribute(rapidxml::xml_node<> *componentXml, std::string attribute);
|
||||
ScrollingList * BuildMenu(rapidxml::xml_node<> *menuXml);
|
||||
void BuildCustomMenu(ScrollingList *menu, rapidxml::xml_node<> *menuXml, rapidxml::xml_node<> *itemDefaults);
|
||||
void BuildVerticalMenu(ScrollingList *menu, rapidxml::xml_node<> *menuXml, rapidxml::xml_node<> *itemDefaults);
|
||||
|
||||
int ParseMenuPosition(std::string strIndex);
|
||||
|
||||
rapidxml::xml_attribute<> *FindAttribute(rapidxml::xml_node<> *componentXml, std::string attribute, rapidxml::xml_node<> *defaultXml);
|
||||
|
||||
void GetTweenSets(rapidxml::xml_node<> *node, std::vector<std::vector<Tween *> *> *tweenSets);
|
||||
@ -51,10 +55,17 @@ private:
|
||||
|
||||
void LoadLayoutXml();
|
||||
void LoadAnimations(std::string keyPrefix, Component &component, ViewInfo *defaults);
|
||||
std::vector<ViewInfo *> *BuildTweenPoints(std::string iteratorPrefix, ViewInfo *defaults);
|
||||
std::vector<ViewInfo *> * BuildTweenPoints(std::string iteratorPrefix, ViewInfo *defaults);
|
||||
Component * LoadComponent(std::string keyPrefix);
|
||||
ScrollingList * LoadMenu();
|
||||
ViewInfo * CreateMenuItemInfo(rapidxml::xml_node<> *component, rapidxml::xml_node<> *defaults, float y);
|
||||
|
||||
void LoadListItems(std::string keyPrefix, std::vector<ViewInfo *> *tweenPointList, ViewInfo *defaults, int &selectedItemIndex);
|
||||
void UpdateViewInfoFromTag(std::string keyPrefix, ViewInfo *p, ViewInfo *defaults);
|
||||
|
||||
static const int MENU_FIRST = 0; // first visible item in the list
|
||||
static const int MENU_LAST = -3; // last visible item in the list
|
||||
static const int MENU_START = -1; // first item transitions here after it scrolls "off the menu/screen"
|
||||
static const int MENU_END = -2; // last item transitions here after it scrolls "off the menu/screen"
|
||||
static const int MENU_CENTER = -4;
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user