mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-11-27 21:54:15 +01:00
- changed flipping the selected cover. press 'A' to flip it and 'B' to flip it back. This fixes the problem of the cover not always flipping back.
- fixed a small problem from last commit where sourceflow would use sideflow or shortflow after selecting one of those plugins. now it uses the correct flow. - made flows appear faster after selecting a source.
This commit is contained in:
parent
ce0108939d
commit
5cefb92df7
BIN
out/boot.dol
BIN
out/boot.dol
Binary file not shown.
Before Width: | Height: | Size: 3.1 MiB After Width: | Height: | Size: 3.1 MiB |
@ -558,12 +558,9 @@ void CCoverFlow::setCoverFlipping(const Vector3D &pos, const Vector3D &angle, co
|
|||||||
|
|
||||||
void CCoverFlow::setCoverFlipPos(const Vector3D &pos)
|
void CCoverFlow::setCoverFlipPos(const Vector3D &pos)
|
||||||
{
|
{
|
||||||
if (m_covers == NULL || !m_selected) return;
|
if(m_covers == NULL || !m_selected) return;
|
||||||
LockMutex lock(m_mutex);
|
LockMutex lock(m_mutex);
|
||||||
|
m_covers[m_range / 2].targetPos = m_loSelected.centerPos + pos;
|
||||||
CCoverFlow::CCover &cvr = m_covers[m_range / 2];
|
|
||||||
m_flipCoverPos = pos;
|
|
||||||
cvr.targetPos = m_loSelected.centerPos + m_flipCoverPos;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CCoverFlow::setBlur(u32 blurResolution, u32 blurRadius, float blurFactor)
|
void CCoverFlow::setBlur(u32 blurResolution, u32 blurRadius, float blurFactor)
|
||||||
@ -628,7 +625,7 @@ void CCoverFlow::applySettings(void)
|
|||||||
if (m_covers == NULL) return;
|
if (m_covers == NULL) return;
|
||||||
|
|
||||||
LockMutex lock(m_mutex);
|
LockMutex lock(m_mutex);
|
||||||
_updateAllTargets();
|
_updateAllTargets(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CCoverFlow::stopCoverLoader(bool empty)
|
void CCoverFlow::stopCoverLoader(bool empty)
|
||||||
@ -1607,7 +1604,7 @@ void CCoverFlow::cancel(void)
|
|||||||
void CCoverFlow::defaultLoad(void)
|
void CCoverFlow::defaultLoad(void)
|
||||||
{
|
{
|
||||||
_loadAllCovers(0);
|
_loadAllCovers(0);
|
||||||
_updateAllTargets();
|
_updateAllTargets(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CCoverFlow::_updateAllTargets(bool instant)
|
void CCoverFlow::_updateAllTargets(bool instant)
|
||||||
@ -2103,7 +2100,7 @@ bool CCoverFlow::findId(const char *id, bool instant, bool path)
|
|||||||
if (instant)
|
if (instant)
|
||||||
{
|
{
|
||||||
_loadAllCovers(i);
|
_loadAllCovers(i);
|
||||||
_updateAllTargets();
|
_updateAllTargets(true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -509,8 +509,16 @@ void CMenu::_game(bool launch)
|
|||||||
}
|
}
|
||||||
if(BTN_HOME_PRESSED || BTN_B_PRESSED)
|
if(BTN_HOME_PRESSED || BTN_B_PRESSED)
|
||||||
{
|
{
|
||||||
_cleanupBanner();
|
if(BTN_B_PRESSED && coverFlipped)
|
||||||
break;
|
{
|
||||||
|
CoverFlow.flip();
|
||||||
|
coverFlipped = false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_cleanupBanner();
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if(BTN_PLUS_PRESSED && !coverFlipped && m_GameTDBAvailable && !NoGameID(hdr->type))
|
else if(BTN_PLUS_PRESSED && !coverFlipped && m_GameTDBAvailable && !NoGameID(hdr->type))
|
||||||
{
|
{
|
||||||
@ -686,7 +694,7 @@ void CMenu::_game(bool launch)
|
|||||||
m_gcfg2.unload();
|
m_gcfg2.unload();
|
||||||
_showGame();
|
_showGame();
|
||||||
}
|
}
|
||||||
else
|
else if(!coverFlipped)
|
||||||
{
|
{
|
||||||
for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
|
for(int chan = WPAD_MAX_WIIMOTES-1; chan >= 0; chan--)
|
||||||
{
|
{
|
||||||
@ -697,18 +705,9 @@ void CMenu::_game(bool launch)
|
|||||||
key = "flip_pos";
|
key = "flip_pos";
|
||||||
if(!m_vid.wide())
|
if(!m_vid.wide())
|
||||||
key += "_4_3";
|
key += "_4_3";
|
||||||
coverFlipped = !coverFlipped;
|
v = m_coverflow.getVector3D(domain, key);
|
||||||
if(coverFlipped)
|
coverFlipped = true;
|
||||||
{
|
CoverFlow.flip();
|
||||||
v = m_coverflow.getVector3D(domain, key);
|
|
||||||
savedv = v;
|
|
||||||
CoverFlow.flip(true, true);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
CoverFlow.setCoverFlipPos(savedv);
|
|
||||||
CoverFlow.flip(true, false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -159,7 +159,7 @@ void CMenu::LoadView(void)
|
|||||||
cf_domain = "_SMALLFLOW";
|
cf_domain = "_SMALLFLOW";
|
||||||
if(m_sourceflow && m_cfg.getBool(_domainFromView(), "smallbox", true))
|
if(m_sourceflow && m_cfg.getBool(_domainFromView(), "smallbox", true))
|
||||||
cf_domain = "_SMALLFLOW";
|
cf_domain = "_SMALLFLOW";
|
||||||
if(m_current_view == COVERFLOW_PLUGIN)
|
if(m_current_view == COVERFLOW_PLUGIN && !m_sourceflow)
|
||||||
{
|
{
|
||||||
vector<bool> pluginsEnabled = m_plugin.GetEnabledPlugins(m_cfg, &enabledPluginsCount);
|
vector<bool> pluginsEnabled = m_plugin.GetEnabledPlugins(m_cfg, &enabledPluginsCount);
|
||||||
if(pluginsEnabled.size() > 0)
|
if(pluginsEnabled.size() > 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user