mirror of https://github.com/AxioDL/metaforce.git
Windows Fixes
This commit is contained in:
parent
7c99de82ec
commit
6301af3133
|
@ -13,6 +13,7 @@ void CModel::Touch(int) const
|
|||
|
||||
bool CModel::IsLoaded(int) const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@ CGuiBackground* CGuiBackground::Create(CGuiFrame* frame, CInputStream& in, bool
|
|||
in.readUint32Big();
|
||||
in.readUint32Big();
|
||||
in.readUint32Big();
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -189,54 +189,67 @@ CGuiTableGroup::CGuiTableGroup(const CGuiWidgetParms& parms, int a, int b, ETabl
|
|||
|
||||
bool CGuiTableGroup::MAF_SelectNextColumn(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_SelectPrevColumn(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_SelectNextRow(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_SelectPrevRow(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_SelectNextColumnSkipUnActivated(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_SelectPrevColumnSkipUnActivated(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_SelectNextRowSkipUnActivated(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_SelectPrevRowSkipUnActivated(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_SelectColumnAtIndex(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_SelectRowAtIndex(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_InitializeTable(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_MenuAdvance(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiTableGroup::MAF_MenuCancel(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
CGuiTableGroup* CGuiTableGroup::Create(CGuiFrame* frame, CInputStream& in, bool flag)
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
#include "CTextParser.hpp"
|
||||
#include "Graphics/CGraphicsPalette.hpp"
|
||||
#include "Graphics/CGraphics.hpp"
|
||||
#include "GuiSys/CRasterFont.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
|
|
|
@ -67,6 +67,7 @@ CGuiWidget* CGuiWidget::Create(CGuiFrame* frame, CInputStream& in, bool flag)
|
|||
|
||||
bool CGuiWidget::Message(const CGuiMessage& msg)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
void CGuiWidget::ParseBaseInfo(CGuiFrame* frame, CInputStream& in, const CGuiWidgetParms& parms)
|
||||
|
@ -703,26 +704,32 @@ void CGuiWidget::SetIsActive(bool a, bool b)
|
|||
|
||||
bool CGuiWidget::MAF_StartAnimationSet(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiWidget::MAF_SendMessage(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiWidget::MAF_PauseAnim(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiWidget::MAF_ResumeAnim(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiWidget::MAF_SetState(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CGuiWidget::MAF_SetStateOfWidget(CGuiFunctionDef* def, CGuiControllerInfo* info)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#include "GuiSys/CRasterFont.hpp"
|
||||
#include "CDrawStringOptions.hpp"
|
||||
#include "CTextRenderBuffer.hpp"
|
||||
#include "Graphics/CTexture.hpp"
|
||||
|
||||
namespace urde
|
||||
{
|
||||
|
|
|
@ -86,21 +86,29 @@ private:
|
|||
struct BooFontCharacters
|
||||
{
|
||||
TToken<CRasterFont> m_font;
|
||||
boo::IGraphicsBufferD* m_instBuf;
|
||||
boo::IShaderDataBinding* m_dataBinding;
|
||||
boo::IGraphicsBufferD* m_instBuf = nullptr;
|
||||
boo::IShaderDataBinding* m_dataBinding = nullptr;
|
||||
std::vector<BooCharacterInstance> m_charData;
|
||||
u32 m_charCount = 0;
|
||||
bool m_dirty = true;
|
||||
BooFontCharacters(const CToken& token)
|
||||
: m_font(token)
|
||||
{
|
||||
}
|
||||
};
|
||||
std::vector<BooFontCharacters> m_fontCharacters;
|
||||
|
||||
struct BooImage
|
||||
{
|
||||
CFontImageDef m_imageDef;
|
||||
boo::IGraphicsBufferD* m_instBuf;
|
||||
boo::IGraphicsBufferD* m_instBuf = nullptr;
|
||||
std::vector<boo::IShaderDataBinding*> m_dataBinding;
|
||||
BooImageInstance m_imageData;
|
||||
bool m_dirty = true;
|
||||
BooImage(const CFontImageDef& imgDef)
|
||||
: m_imageDef(imgDef)
|
||||
{
|
||||
}
|
||||
};
|
||||
std::vector<BooImage> m_images;
|
||||
|
||||
|
|
Loading…
Reference in New Issue