mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-11-27 21:54:15 +01:00
-added meta.xml args for custom wait message images. waitdir= for full path to folder containing the images. and waitloop if you want the images to play and repeat otherwise the images move forward and backward.
-added widescreen fix just for wait images. may attempt more as time goes by. -fixed a small thing i forgot in the last commit for cache covers.
This commit is contained in:
parent
6782d87f3a
commit
1e57a1c9e6
BIN
out/boot.dol
BIN
out/boot.dol
Binary file not shown.
Before Width: | Height: | Size: 3.3 MiB After Width: | Height: | Size: 3.3 MiB |
@ -11,6 +11,9 @@
|
|||||||
#include "gecko/gecko.hpp"
|
#include "gecko/gecko.hpp"
|
||||||
#include "loader/sys.h"
|
#include "loader/sys.h"
|
||||||
#include "loader/utils.h"
|
#include "loader/utils.h"
|
||||||
|
#include "list/ListGenerator.hpp"
|
||||||
|
#include "text.hpp"
|
||||||
|
#include "fileOps/fileOps.h"
|
||||||
|
|
||||||
#define DEFAULT_FIFO_SIZE (256 * 1024)
|
#define DEFAULT_FIFO_SIZE (256 * 1024)
|
||||||
|
|
||||||
@ -553,6 +556,95 @@ void CVideo::render(void)
|
|||||||
GX_InvalidateTexAll();
|
GX_InvalidateTexAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool custom = false;
|
||||||
|
bool waitLoop = false;
|
||||||
|
static vector<string> waitImgs;
|
||||||
|
static void GrabWaitFiles(char *FullPath)
|
||||||
|
{
|
||||||
|
//Just push back
|
||||||
|
waitImgs.push_back(FullPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CVideo::setCustomWaitImgs(const char *path, bool wait_loop)
|
||||||
|
{
|
||||||
|
waitImgs.clear();
|
||||||
|
if(path != NULL && fsop_FolderExist(path))
|
||||||
|
{
|
||||||
|
GetFiles(path, stringToVector(".png|.jpg", '|'), GrabWaitFiles, false, 1);
|
||||||
|
if(waitImgs.size() > 0)
|
||||||
|
{
|
||||||
|
custom = true;
|
||||||
|
waitLoop = wait_loop;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void CVideo::waitMessage(float delay)// called from main.cpp to show wait animation on wf boot
|
||||||
|
{
|
||||||
|
if(m_defaultWaitMessages.size() == 0)
|
||||||
|
{
|
||||||
|
if(custom)
|
||||||
|
{
|
||||||
|
u8 waitImgs_cnt = waitImgs.size();
|
||||||
|
TexData m_wTextures[waitImgs_cnt];
|
||||||
|
for(u8 i = 0; i < waitImgs_cnt; i++)
|
||||||
|
{
|
||||||
|
TexHandle.fromImageFile(m_wTextures[i], waitImgs[i].c_str());
|
||||||
|
}
|
||||||
|
for(u8 i = 0; i < waitImgs_cnt; i++)
|
||||||
|
m_defaultWaitMessages.push_back(m_wTextures[i]);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
TexData m_wTextures[8];
|
||||||
|
TexHandle.fromJPG(m_wTextures[0], wait_01_jpg, wait_01_jpg_size);
|
||||||
|
TexHandle.fromJPG(m_wTextures[1], wait_02_jpg, wait_02_jpg_size);
|
||||||
|
TexHandle.fromJPG(m_wTextures[2], wait_03_jpg, wait_03_jpg_size);
|
||||||
|
TexHandle.fromJPG(m_wTextures[3], wait_04_jpg, wait_04_jpg_size);
|
||||||
|
TexHandle.fromJPG(m_wTextures[4], wait_05_jpg, wait_05_jpg_size);
|
||||||
|
TexHandle.fromJPG(m_wTextures[5], wait_06_jpg, wait_06_jpg_size);
|
||||||
|
TexHandle.fromJPG(m_wTextures[6], wait_07_jpg, wait_07_jpg_size);
|
||||||
|
TexHandle.fromJPG(m_wTextures[7], wait_08_jpg, wait_08_jpg_size);
|
||||||
|
for(int i = 0; i < 8; i++)
|
||||||
|
m_defaultWaitMessages.push_back(m_wTextures[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
waitMessage(m_defaultWaitMessages, delay);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CVideo::waitMessage(const vector<TexData> &tex, float delay)// start wait images and wii slot light threads or draw
|
||||||
|
{
|
||||||
|
hideWaitMessage();
|
||||||
|
|
||||||
|
if(tex.size() == 0)
|
||||||
|
{
|
||||||
|
m_waitMessages = m_defaultWaitMessages;
|
||||||
|
m_waitMessageDelay = 0.15f;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_waitMessages = tex;
|
||||||
|
m_waitMessageDelay = delay;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(m_waitMessages.size() == 1)
|
||||||
|
{
|
||||||
|
waitMessage(m_waitMessages[0]);// draws frame image using function below (for one frame image only) but no render?
|
||||||
|
render();
|
||||||
|
}
|
||||||
|
else if(m_waitMessages.size() > 1)// if more than one frame
|
||||||
|
{
|
||||||
|
m_WaitThreadRunning = true;
|
||||||
|
/* changing light */
|
||||||
|
wiiLightSetLevel(0);
|
||||||
|
wiiLightStartThread();// start thread in gekko.c that pulses the wii disc slot light on and off
|
||||||
|
/* onscreen animation */
|
||||||
|
m_showWaitMessage = true;// start wait images thread to animate them
|
||||||
|
LWP_CreateThread(&waitThread, _showWaitMessages, this, waitMessageStack, waitMessageStackSize, LWP_PRIO_HIGHEST);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void * CVideo::_showWaitMessages(void *obj)// wait images thread
|
void * CVideo::_showWaitMessages(void *obj)// wait images thread
|
||||||
{
|
{
|
||||||
CVideo *m = static_cast<CVideo *>(obj);
|
CVideo *m = static_cast<CVideo *>(obj);
|
||||||
@ -590,7 +682,9 @@ void * CVideo::_showWaitMessages(void *obj)// wait images thread
|
|||||||
{
|
{
|
||||||
m->waitMessage(*waitItr);// draw frame image
|
m->waitMessage(*waitItr);// draw frame image
|
||||||
waitItr += PNGfadeDirection;// move to next image
|
waitItr += PNGfadeDirection;// move to next image
|
||||||
if(waitItr + 1 == m->m_waitMessages.end() || waitItr == m->m_waitMessages.begin())
|
if(waitLoop && waitItr == m->m_waitMessages.end())
|
||||||
|
waitItr = m->m_waitMessages.begin();
|
||||||
|
else if(!waitLoop && (waitItr + 1 == m->m_waitMessages.end() || waitItr == m->m_waitMessages.begin()))
|
||||||
PNGfadeDirection *= (-1);// change direction if at beginning or end
|
PNGfadeDirection *= (-1);// change direction if at beginning or end
|
||||||
waitFrames = frames;// reset delay count
|
waitFrames = frames;// reset delay count
|
||||||
m->render();
|
m->render();
|
||||||
@ -622,54 +716,6 @@ void CVideo::hideWaitMessage()// stop wait images and wii disc slot light thread
|
|||||||
waitThread = LWP_THREAD_NULL;
|
waitThread = LWP_THREAD_NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CVideo::waitMessage(float delay)// called from main.cpp to show wait animation on wf boot
|
|
||||||
{
|
|
||||||
if(m_defaultWaitMessages.size() == 0)
|
|
||||||
{
|
|
||||||
TexData m_wTextures[8];
|
|
||||||
TexHandle.fromJPG(m_wTextures[0], wait_01_jpg, wait_01_jpg_size);
|
|
||||||
TexHandle.fromJPG(m_wTextures[1], wait_02_jpg, wait_02_jpg_size);
|
|
||||||
TexHandle.fromJPG(m_wTextures[2], wait_03_jpg, wait_03_jpg_size);
|
|
||||||
TexHandle.fromJPG(m_wTextures[3], wait_04_jpg, wait_04_jpg_size);
|
|
||||||
TexHandle.fromJPG(m_wTextures[4], wait_05_jpg, wait_05_jpg_size);
|
|
||||||
TexHandle.fromJPG(m_wTextures[5], wait_06_jpg, wait_06_jpg_size);
|
|
||||||
TexHandle.fromJPG(m_wTextures[6], wait_07_jpg, wait_07_jpg_size);
|
|
||||||
TexHandle.fromJPG(m_wTextures[7], wait_08_jpg, wait_08_jpg_size);
|
|
||||||
for(int i = 0; i < 8; i++)
|
|
||||||
m_defaultWaitMessages.push_back(m_wTextures[i]);
|
|
||||||
}
|
|
||||||
waitMessage(m_defaultWaitMessages, delay);
|
|
||||||
}
|
|
||||||
|
|
||||||
void CVideo::waitMessage(const vector<TexData> &tex, float delay)// start wait images and wii slot light threads or draw
|
|
||||||
{
|
|
||||||
hideWaitMessage();
|
|
||||||
m_WaitThreadRunning = true;
|
|
||||||
|
|
||||||
if(tex.size() == 0)
|
|
||||||
{
|
|
||||||
m_waitMessages = m_defaultWaitMessages;
|
|
||||||
m_waitMessageDelay = 0.15f;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_waitMessages = tex;
|
|
||||||
m_waitMessageDelay = delay;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(m_waitMessages.size() == 1)
|
|
||||||
waitMessage(m_waitMessages[0]);// draws frame image using function below (for one frame image only) but no render?
|
|
||||||
else if(m_waitMessages.size() > 1)// if more than one frame
|
|
||||||
{
|
|
||||||
/* changing light */
|
|
||||||
wiiLightSetLevel(0);
|
|
||||||
wiiLightStartThread();// start thread in gekko.c that pulses the wii disc slot light on and off
|
|
||||||
/* onscreen animation */
|
|
||||||
m_showWaitMessage = true;// start wait images thread to animate them
|
|
||||||
LWP_CreateThread(&waitThread, _showWaitMessages, this, waitMessageStack, waitMessageStackSize, LWP_PRIO_HIGHEST);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void CVideo::waitMessage(const TexData &tex)//draw frame image
|
void CVideo::waitMessage(const TexData &tex)//draw frame image
|
||||||
{
|
{
|
||||||
Mtx modelViewMtx;
|
Mtx modelViewMtx;
|
||||||
@ -696,13 +742,14 @@ void CVideo::waitMessage(const TexData &tex)//draw frame image
|
|||||||
GX_InitTexObj(&texObj, tex.data, tex.width, tex.height, tex.format, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
GX_InitTexObj(&texObj, tex.data, tex.width, tex.height, tex.format, GX_CLAMP, GX_CLAMP, GX_FALSE);
|
||||||
GX_LoadTexObj(&texObj, GX_TEXMAP0);
|
GX_LoadTexObj(&texObj, GX_TEXMAP0);
|
||||||
GX_Begin(GX_QUADS, GX_VTXFMT0, 4);
|
GX_Begin(GX_QUADS, GX_VTXFMT0, 4);
|
||||||
GX_Position3f32((float)((640 - tex.width) / 2), (float)((480 - tex.height) / 2), 0.f);
|
u32 texWidth = m_wide ? tex.width * .75 : tex.width;
|
||||||
|
GX_Position3f32((float)((640 - texWidth) / 2), (float)((480 - tex.height) / 2), 0.f);// widescreen = tex.width * .80
|
||||||
GX_TexCoord2f32(0.f, 0.f);
|
GX_TexCoord2f32(0.f, 0.f);
|
||||||
GX_Position3f32((float)((640 + tex.width) / 2), (float)((480 - tex.height) / 2), 0.f);
|
GX_Position3f32((float)((640 + texWidth) / 2), (float)((480 - tex.height) / 2), 0.f);
|
||||||
GX_TexCoord2f32(1.f, 0.f);
|
GX_TexCoord2f32(1.f, 0.f);
|
||||||
GX_Position3f32((float)((640 + tex.width) / 2), (float)((480 + tex.height) / 2), 0.f);
|
GX_Position3f32((float)((640 + texWidth) / 2), (float)((480 + tex.height) / 2), 0.f);
|
||||||
GX_TexCoord2f32(1.f, 1.f);
|
GX_TexCoord2f32(1.f, 1.f);
|
||||||
GX_Position3f32((float)((640 - tex.width) / 2), (float)((480 + tex.height) / 2), 0.f);
|
GX_Position3f32((float)((640 - texWidth) / 2), (float)((480 + tex.height) / 2), 0.f);
|
||||||
GX_TexCoord2f32(0.f, 1.f);
|
GX_TexCoord2f32(0.f, 1.f);
|
||||||
GX_End();
|
GX_End();
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@ public:
|
|||||||
GXRModeObj *vid_mode(void) const { return m_rmode; }
|
GXRModeObj *vid_mode(void) const { return m_rmode; }
|
||||||
u32 width2D(void) { return m_width2D; }
|
u32 width2D(void) { return m_width2D; }
|
||||||
u32 height2D(void) { return m_height2D; }
|
u32 height2D(void) { return m_height2D; }
|
||||||
bool wide(void) const { return m_wide; }
|
bool wide(void) const { return m_wide; }// call m_vid.wide to check if wii is widescreen
|
||||||
bool vid_50hz(void) const { return m_50hz; }
|
bool vid_50hz(void) const { return m_50hz; }
|
||||||
u8 getAA(void) const { return m_aa; }
|
u8 getAA(void) const { return m_aa; }
|
||||||
bool showingWaitMessage() { return m_WaitThreadRunning; }
|
bool showingWaitMessage() { return m_WaitThreadRunning; }
|
||||||
@ -68,11 +68,12 @@ public:
|
|||||||
void prepareStencil(void);
|
void prepareStencil(void);
|
||||||
void renderStencil(void);
|
void renderStencil(void);
|
||||||
int stencilVal(int x, int y);
|
int stencilVal(int x, int y);
|
||||||
|
void setCustomWaitImgs(const char *path, bool loop);
|
||||||
void hideWaitMessage();
|
void hideWaitMessage();
|
||||||
void waitMessage(float delay);
|
void waitMessage(float delay);
|
||||||
void waitMessage(const vector<TexData> &tex, float delay);
|
void waitMessage(const vector<TexData> &tex, float delay);
|
||||||
void waitMessage(const TexData &tex);
|
void waitMessage(const TexData &tex);
|
||||||
s32 TakeScreenshot(const char *);
|
s32 TakeScreenshot(const char *path);
|
||||||
void shiftViewPort(float x, float y);
|
void shiftViewPort(float x, float y);
|
||||||
private:
|
private:
|
||||||
GXRModeObj *m_rmode;
|
GXRModeObj *m_rmode;
|
||||||
|
@ -39,6 +39,9 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
char *gameid = NULL;
|
char *gameid = NULL;
|
||||||
bool iosOK = true;
|
bool iosOK = true;
|
||||||
|
bool wait_loop = false;
|
||||||
|
char wait_dir[256];
|
||||||
|
memset(&wait_dir, 0, sizeof(wait_dir));
|
||||||
|
|
||||||
for(u8 i = 0; i < argc; i++)
|
for(u8 i = 0; i < argc; i++)
|
||||||
{
|
{
|
||||||
@ -58,6 +61,16 @@ int main(int argc, char **argv)
|
|||||||
gameid = NULL;
|
gameid = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if(strcasestr(argv[i], "waitdir=") != NULL)
|
||||||
|
{
|
||||||
|
char *ptr = strcasestr(argv[i], "waitdir=");
|
||||||
|
strncpy(wait_dir, ptr+strlen("waitdir="), sizeof(wait_dir));
|
||||||
|
}
|
||||||
|
else if(strcasestr(argv[i], "Waitloop") != NULL)
|
||||||
|
{
|
||||||
|
wait_loop = true;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
check_neek2o();
|
check_neek2o();
|
||||||
/* Init ISFS */
|
/* Init ISFS */
|
||||||
@ -78,6 +91,7 @@ int main(int argc, char **argv)
|
|||||||
Sys_ExitTo(EXIT_TO_HBC);
|
Sys_ExitTo(EXIT_TO_HBC);
|
||||||
|
|
||||||
DeviceHandle.MountAll();
|
DeviceHandle.MountAll();
|
||||||
|
m_vid.setCustomWaitImgs(wait_dir, wait_loop);
|
||||||
m_vid.waitMessage(0.15f);
|
m_vid.waitMessage(0.15f);
|
||||||
|
|
||||||
Open_Inputs();
|
Open_Inputs();
|
||||||
|
@ -93,6 +93,7 @@ bool CMenu::_Home(void)
|
|||||||
}
|
}
|
||||||
else if(m_btnMgr.selected(m_homeBtnUpdate))
|
else if(m_btnMgr.selected(m_homeBtnUpdate))
|
||||||
{
|
{
|
||||||
|
_hideHome();
|
||||||
m_btnMgr.setProgress(m_wbfsPBar, 0.f, true);
|
m_btnMgr.setProgress(m_wbfsPBar, 0.f, true);
|
||||||
m_btnMgr.setText(m_wbfsLblMessage, L"0%");
|
m_btnMgr.setText(m_wbfsLblMessage, L"0%");
|
||||||
m_btnMgr.setText(m_wbfsLblDialog, L"");
|
m_btnMgr.setText(m_wbfsLblDialog, L"");
|
||||||
|
Loading…
Reference in New Issue
Block a user