2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 12:24:56 +00:00

Windows build fixes and warning avoidance

This commit is contained in:
Jack Andersen
2018-05-24 20:39:38 -10:00
parent 3ceaa82035
commit 70b3404b7c
195 changed files with 428 additions and 502 deletions

View File

@@ -40,7 +40,7 @@ CToken ProjectResourcePool::GetObj(std::string_view name, const CVParamTransfer&
bool ProjectManager::m_registeredSpecs = false;
ProjectManager::ProjectManager(ViewManager &vm)
: m_vm(vm), m_clientProc(nullptr, 1),
: m_vm(vm), m_clientProc(nullptr),
m_factoryMP1(m_clientProc), m_objStore(m_factoryMP1, *this)
{
if (!m_registeredSpecs)

View File

@@ -23,7 +23,7 @@ public:
private:
hecl::ProjectPath m_path;
Space::Class m_defaultClass = Space::Class::None;
EditorSpace* m_editingSpace = nullptr;
//EditorSpace* m_editingSpace = nullptr;
std::vector<ViewerSpace*> m_viewingSpaces;
public:
static Space::Class DeduceDefaultSpaceClass(const hecl::ProjectPath& path);

View File

@@ -24,7 +24,6 @@ specter::View* Space::buildSpaceView(specter::ViewResources& res)
specter::View* sview = buildContentView(res);
m_spaceView->setContentView(sview);
specter::Toolbar& tb = *m_spaceView->toolbar();
const std::string* classStr = SpaceMenuNode::LookupClassString(m_class);
specter::Icon* classIcon = SpaceMenuNode::LookupClassIcon(m_class);
const zeus::CColor* classColor = SpaceMenuNode::LookupClassColor(m_class);
m_spaceSelectButton.reset(new specter::Button(res, tb, &m_spaceSelectBind, "", classIcon,

View File

@@ -49,9 +49,9 @@ public:
static Space* NewSpaceFromConfigStream(ViewManager& vm, Space* parent, ConfigReader& r);
static RootSpace* NewRootSpaceFromConfigStream(ViewManager& vm, ConfigReader& r);
struct SpaceMenuNode : specter::IMenuNode
struct SpaceMenuNode final : specter::IMenuNode
{
struct SubNodeData : specter::IMenuNode
struct SubNodeData final : specter::IMenuNode
{
Class m_cls;
std::string m_key;
@@ -66,7 +66,7 @@ public:
};
static std::vector<SubNodeData> s_subNodeDats;
struct SubNode : specter::IMenuNode
struct SubNode final : specter::IMenuNode
{
Space& m_space;
const SubNodeData& m_data;
@@ -402,7 +402,7 @@ public:
AT_DECL_DNA_YAML
AT_DECL_DNAV
} m_state;
Space::State& spaceState() {return m_state;}
const Space::State& spaceState() const {return m_state;}
bool usesToolbar() const {return true;}
void buildToolbarView(specter::ViewResources& res, specter::Toolbar& tb)

View File

@@ -30,10 +30,10 @@ SplashScreen::SplashScreen(ViewManager& vm, specter::ViewResources& res)
m_textColor(res.themeData().uiText()),
m_textColorClear(m_textColor),
m_newString(m_vm.translateOr("new_project", "New Project")),
m_newProjBind(*this),
m_openString(m_vm.translateOr("open_project", "Open Project")),
m_openProjBind(*this),
m_extractString(m_vm.translateOr("extract_game", "Extract Game")),
m_newProjBind(*this),
m_openProjBind(*this),
m_extractProjBind(*this)
{
if (GIT_COMMIT_DATE[0] != '\0' &&

View File

@@ -89,7 +89,7 @@ class SplashScreen : public specter::ModalWindow
std::string m_text;
const std::string* text() const {return &m_text;}
struct OpenRecentMenuItem : specter::IMenuNode
struct OpenRecentMenuItem final : specter::IMenuNode
{
OpenRecentMenuRoot& m_parent;

View File

@@ -26,7 +26,7 @@ namespace urde
{
class SplashScreen;
class ViewManager : public specter::IViewManager
class ViewManager final : public specter::IViewManager
{
friend class ProjectManager;
friend class Space;

View File

@@ -28,7 +28,7 @@ void InitializeBadging(specter::ViewResources& viewRes)
if (uncompress(texels.get(), &destSz, URDE_BADGE + pos, URDE_BADGE_SZ - pos) != Z_OK)
Log.report(logvisor::Fatal, "unable to decompress badge");
viewRes.m_factory->BooCommitTransaction([&](boo::IGraphicsDataFactory::Context& ctx)
viewRes.m_factory->commitTransaction([&](boo::IGraphicsDataFactory::Context& ctx)
{
specter::IconAtlas<1, 1> atlas;
@@ -37,7 +37,7 @@ void InitializeBadging(specter::ViewResources& viewRes)
texels.get(), destSz));
g_BadgeIcon = atlas.getIcon(0, 0);
return true;
});
} BooTrace);
}
void DestroyBadging()

View File

@@ -28,14 +28,14 @@ void InitializeIcons(specter::ViewResources& viewRes)
if (uncompress(texels.get(), &destSz, URDE_ICONS + pos, URDE_ICONS_SZ - pos) != Z_OK)
Log.report(logvisor::Fatal, "unable to decompress icons");
viewRes.m_factory->BooCommitTransaction([&](boo::IGraphicsDataFactory::Context& ctx)
viewRes.m_factory->commitTransaction([&](boo::IGraphicsDataFactory::Context& ctx)
{
g_IconAtlas.initializeAtlas(ctx.newStaticTexture(width, height, mips,
boo::TextureFormat::RGBA8,
boo::TextureClampMode::Repeat,
texels.get(), destSz));
return true;
});
} BooTrace);
}
void DestroyIcons()