diff --git a/.gitignore b/.gitignore index dd4d67057..de2f93579 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ version.h *.autosave docs/* .idea/ -Editor/platforms/win/urde.rc +Editor/platforms/win/metaforce.rc .vs/ out/ cmake-build-*/ \ No newline at end of file diff --git a/DataSpec/DNACommon/CMakeLists.txt b/DataSpec/DNACommon/CMakeLists.txt index b4387de34..116564f8a 100644 --- a/DataSpec/DNACommon/CMakeLists.txt +++ b/DataSpec/DNACommon/CMakeLists.txt @@ -9,7 +9,7 @@ make_dnalist(CMDL EGMC SAVWCommon ParticleCommon - URDEVersionInfo + MetaforceVersionInfo Tweaks/ITweakPlayerGun) set(DNACOMMON_SOURCES @@ -41,7 +41,7 @@ set(DNACOMMON_SOURCES RigInverter.hpp RigInverter.cpp AROTBuilder.hpp AROTBuilder.cpp OBBTreeBuilder.hpp OBBTreeBuilder.cpp - URDEVersionInfo.hpp + MetaforceVersionInfo.hpp Tweaks/ITweak.hpp Tweaks/TweakWriter.hpp Tweaks/ITweakGame.hpp diff --git a/DataSpec/DNACommon/CRSC.cpp b/DataSpec/DNACommon/CRSC.cpp index 45069cd35..a66b912f0 100644 --- a/DataSpec/DNACommon/CRSC.cpp +++ b/DataSpec/DNACommon/CRSC.cpp @@ -11,12 +11,12 @@ AT_SUBSPECIALIZE_DNA_YAML(PPImpl<_CRSM>) template <> std::string_view PPImpl<_CRSM>::DNAType() { - return "urde::CRSM"sv; + return "CRSM"sv; } template <> std::string_view PPImpl<_CRSM>::DNAType() { - return "urde::CRSM"sv; + return "CRSM"sv; } template diff --git a/DataSpec/DNACommon/DNACommon.cpp b/DataSpec/DNACommon/DNACommon.cpp index dcf816b81..6174765ba 100644 --- a/DataSpec/DNACommon/DNACommon.cpp +++ b/DataSpec/DNACommon/DNACommon.cpp @@ -4,7 +4,7 @@ namespace DataSpec { -logvisor::Module LogDNACommon("urde::DNACommon"); +logvisor::Module LogDNACommon("DataSpec::DNACommon"); ThreadLocalPtr g_curSpec; ThreadLocalPtr g_PakRouter; ThreadLocalPtr g_ThreadBlenderToken; diff --git a/DataSpec/DNACommon/ELSC.cpp b/DataSpec/DNACommon/ELSC.cpp index 7ea266f71..32d3d3cac 100644 --- a/DataSpec/DNACommon/ELSC.cpp +++ b/DataSpec/DNACommon/ELSC.cpp @@ -11,12 +11,12 @@ AT_SUBSPECIALIZE_DNA_YAML(PPImpl<_ELSM>) template <> std::string_view ELSM::DNAType() { - return "urde::ELSM"sv; + return "ELSM"sv; } template <> std::string_view ELSM::DNAType() { - return "urde::ELSM"sv; + return "ELSM"sv; } template diff --git a/DataSpec/DNACommon/FONT.cpp b/DataSpec/DNACommon/FONT.cpp index 3e3e652b8..2c5a7c2a6 100644 --- a/DataSpec/DNACommon/FONT.cpp +++ b/DataSpec/DNACommon/FONT.cpp @@ -5,7 +5,7 @@ #include namespace DataSpec::DNAFont { -logvisor::Module LogModule("urde::DNAFont"); +logvisor::Module LogModule("DataSpec::DNAFont"); template void FONT::_read(athena::io::IStreamReader& __dna_reader) { diff --git a/DataSpec/DNACommon/FSM2.cpp b/DataSpec/DNACommon/FSM2.cpp index 27b73f457..535c2dc1b 100644 --- a/DataSpec/DNACommon/FSM2.cpp +++ b/DataSpec/DNACommon/FSM2.cpp @@ -9,7 +9,7 @@ #include namespace DataSpec::DNAFSM2 { -logvisor::Module LogDNAFSM2("urde::DNAFSM2"); +logvisor::Module LogDNAFSM2("DataSpec::DNAFSM2"); template template @@ -39,12 +39,12 @@ AT_SPECIALIZE_DNA(FSM2) template <> std::string_view FSM2::DNAType() { - return "urde::FSM2"sv; + return "FSM2"sv; } template <> std::string_view FSM2::DNAType() { - return "urde::FSM2"sv; + return "FSM2"sv; } template struct FSM2; diff --git a/DataSpec/DNACommon/URDEVersionInfo.hpp b/DataSpec/DNACommon/MetaforceVersionInfo.hpp similarity index 91% rename from DataSpec/DNACommon/URDEVersionInfo.hpp rename to DataSpec/DNACommon/MetaforceVersionInfo.hpp index 74813af4b..20505ef13 100644 --- a/DataSpec/DNACommon/URDEVersionInfo.hpp +++ b/DataSpec/DNACommon/MetaforceVersionInfo.hpp @@ -13,7 +13,7 @@ enum class EGame { MetroidPrime3, }; -struct URDEVersionInfo : BigDNA { +struct MetaforceVersionInfo : BigDNA { AT_DECL_DNA_YAML String<-1> version; diff --git a/DataSpec/DNACommon/ParticleCommon.cpp b/DataSpec/DNACommon/ParticleCommon.cpp index 301f6ac56..79c1381ee 100644 --- a/DataSpec/DNACommon/ParticleCommon.cpp +++ b/DataSpec/DNACommon/ParticleCommon.cpp @@ -1,7 +1,7 @@ #include "ParticleCommon.hpp" namespace DataSpec::DNAParticle { -logvisor::Module LogModule("urde::DNAParticle"); +logvisor::Module LogModule("DataSpec::DNAParticle"); template struct PEImpl<_RealElementFactory>; template struct PEImpl<_IntElementFactory>; diff --git a/DataSpec/DNACommon/TXTR.cpp b/DataSpec/DNACommon/TXTR.cpp index 815164cc2..e45654b81 100644 --- a/DataSpec/DNACommon/TXTR.cpp +++ b/DataSpec/DNACommon/TXTR.cpp @@ -846,7 +846,7 @@ bool TXTR::Extract(PAKEntryReadStream& rs, const hecl::ProjectPath& outPath) { png_infop info = png_create_info_struct(png); png_text textStruct = {}; - textStruct.key = png_charp("urde_nomip"); + textStruct.key = png_charp("metaforce_nomip"); if (numMips == 1) png_set_text(png, info, &textStruct, 1); @@ -1088,13 +1088,13 @@ bool TXTR::Cook(const hecl::ProjectPath& inPath, const hecl::ProjectPath& outPat return false; } - /* Disable mipmapping if urde_nomip embedded */ + /* Disable mipmapping if metaforce_nomip embedded */ bool mipmap = true; png_text* textStruct; int numText; png_get_text(pngRead, info, &textStruct, &numText); for (int i = 0; i < numText; ++i) { - if (std::strcmp(textStruct[i].key, "urde_nomip") == 0) { + if (std::strcmp(textStruct[i].key, "metaforce_nomip") == 0) { mipmap = false; } } @@ -1401,13 +1401,13 @@ bool TXTR::CookPC(const hecl::ProjectPath& inPath, const hecl::ProjectPath& outP const png_byte colorType = png_get_color_type(pngRead, info); const png_byte bitDepth = png_get_bit_depth(pngRead, info); - /* Disable mipmapping if urde_nomip embedded */ + /* Disable mipmapping if metaforce_nomip embedded */ bool mipmap = true; png_text* textStruct; int numText; png_get_text(pngRead, info, &textStruct, &numText); for (int i = 0; i < numText; ++i) { - if (std::strcmp(textStruct[i].key, "urde_nomip") == 0) { + if (std::strcmp(textStruct[i].key, "metaforce_nomip") == 0) { mipmap = false; } } diff --git a/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp b/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp index bdc29dd7f..4583cd02b 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp @@ -9,8 +9,8 @@ namespace DataSpec { struct ITweakGunRes : ITweak { - using ResId = urde::CAssetId; - using EBeamId = urde::CPlayerState::EBeamId; + using ResId = metaforce::CAssetId; + using EBeamId = metaforce::CPlayerState::EBeamId; ResId x4_gunMotion; ResId x8_grappleArm; @@ -68,7 +68,7 @@ struct ITweakGunRes : ITweak { return x34_weapons[b]; } - void ResolveResources(const urde::IFactory& factory) { + void ResolveResources(const metaforce::IFactory& factory) { x4_gunMotion = factory.GetResourceIdByName(GetGunMotion())->id; x8_grappleArm = factory.GetResourceIdByName(GetGrappleArm())->id; xc_rightHand = factory.GetResourceIdByName(GetRightHand())->id; diff --git a/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp b/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp index 213528a23..328f645ee 100644 --- a/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp +++ b/DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp @@ -9,8 +9,8 @@ namespace DataSpec { struct ITweakPlayerRes : ITweak { - using ResId = urde::CAssetId; - using EBeamId = urde::CPlayerState::EBeamId; + using ResId = metaforce::CAssetId; + using EBeamId = metaforce::CPlayerState::EBeamId; ResId x4_saveStationIcon; ResId x8_missileStationIcon; @@ -85,7 +85,7 @@ struct ITweakPlayerRes : ITweak { } } - void ResolveResources(const urde::IFactory& factory) { + void ResolveResources(const metaforce::IFactory& factory) { x4_saveStationIcon = factory.GetResourceIdByName(_GetSaveStationIcon())->id; x8_missileStationIcon = factory.GetResourceIdByName(_GetMissileStationIcon())->id; xc_elevatorIcon = factory.GetResourceIdByName(_GetElevatorIcon())->id; diff --git a/DataSpec/DNAMP1/AFSM.cpp b/DataSpec/DNAMP1/AFSM.cpp index a8c2033ef..72dd25570 100644 --- a/DataSpec/DNAMP1/AFSM.cpp +++ b/DataSpec/DNAMP1/AFSM.cpp @@ -43,7 +43,7 @@ void AFSM::State::Transition::Enumerate(typename BinarySize: trig.binarySize(s); } -std::string_view AFSM::State::Transition::DNAType() { return "urde::DNAMP1::AFSM::Transition"sv; } +std::string_view AFSM::State::Transition::DNAType() { return "DNAMP1::AFSM::Transition"sv; } template <> void AFSM::State::Transition::Trigger::Enumerate(athena::io::IStreamReader& __dna_reader) { @@ -100,7 +100,7 @@ void AFSM::State::Transition::Trigger::Enumerate(size_t& __i } std::string_view AFSM::State::Transition::Trigger::DNAType() { - return "urde::DNAMP1::AFSM::State::Transition::Trigger"sv; + return "DNAMP1::AFSM::State::Transition::Trigger"sv; } } // namespace DataSpec::DNAMP1 diff --git a/DataSpec/DNAMP1/ANCS.cpp b/DataSpec/DNAMP1/ANCS.cpp index 642da411f..b21a68a44 100644 --- a/DataSpec/DNAMP1/ANCS.cpp +++ b/DataSpec/DNAMP1/ANCS.cpp @@ -139,7 +139,7 @@ void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo::Enumer } std::string_view ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo::DNAType() { - return "urde::DNAMP1::ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo"sv; + return "DNAMP1::ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::ParmInfo"sv; } template <> @@ -315,7 +315,7 @@ void ANCS::CharacterSet::CharacterInfo::PASDatabase::AnimState::Enumerate @@ -606,7 +606,7 @@ void ANCS::CharacterSet::CharacterInfo::Enumerate(athena::io: } std::string_view ANCS::CharacterSet::CharacterInfo::DNAType() { - return "urde::DNAMP1::ANCS::CharacterSet::CharacterInfo"sv; + return "DNAMP1::ANCS::CharacterSet::CharacterInfo"sv; } template <> @@ -688,7 +688,7 @@ void ANCS::AnimationSet::MetaAnimFactory::Enumerate(athena::i } std::string_view ANCS::AnimationSet::MetaAnimFactory::DNAType() { - return "urde::DNAMP1::ANCS::AnimationSet::MetaAnimFactory"sv; + return "DNAMP1::ANCS::AnimationSet::MetaAnimFactory"sv; } template <> @@ -761,7 +761,7 @@ void ANCS::AnimationSet::MetaTransFactory::Enumerate(athena:: } std::string_view ANCS::AnimationSet::MetaTransFactory::DNAType() { - return "urde::DNAMP1::ANCS::AnimationSet::MetaTransFactory"sv; + return "DNAMP1::ANCS::AnimationSet::MetaTransFactory"sv; } template <> @@ -955,7 +955,7 @@ void ANCS::AnimationSet::MetaAnimPrimitive::gatherPrimitives( out[animIdx] = {animName, animId, ANIM::GetEVNTId(rs), false}; } -std::string_view ANCS::AnimationSet::DNAType() { return "urde::DNAMP1::ANCS::AnimationSet"sv; } +std::string_view ANCS::AnimationSet::DNAType() { return "DNAMP1::ANCS::AnimationSet"sv; } bool ANCS::Extract(const SpecBase& dataSpec, PAKEntryReadStream& rs, const hecl::ProjectPath& outPath, PAKRouter& pakRouter, const PAK::Entry& entry, bool force, hecl::blender::Token& btok, @@ -994,7 +994,7 @@ bool ANCS::Cook(const hecl::ProjectPath& outPath, const hecl::ProjectPath& inPat Log.report(logvisor::Fatal, FMT_STRING(_SYS_STR("can't open '{}' for reading")), yamlPath.getRelativePath()); if (!athena::io::ValidateFromYAMLStream(reader)) { - Log.report(logvisor::Fatal, FMT_STRING(_SYS_STR("'{}' is not urde::DNAMP1::ANCS type")), yamlPath.getRelativePath()); + Log.report(logvisor::Fatal, FMT_STRING(_SYS_STR("'{}' is not DNAMP1::ANCS type")), yamlPath.getRelativePath()); } athena::io::YAMLDocReader yamlReader; diff --git a/DataSpec/DNAMP1/DNAMP1.cpp b/DataSpec/DNAMP1/DNAMP1.cpp index 30704552c..b0dd457e2 100644 --- a/DataSpec/DNAMP1/DNAMP1.cpp +++ b/DataSpec/DNAMP1/DNAMP1.cpp @@ -30,7 +30,7 @@ #include "PATH.hpp" #include "DataSpec/DNACommon/Tweaks/TweakWriter.hpp" -#include "DataSpec/DNACommon/URDEVersionInfo.hpp" +#include "DataSpec/DNACommon/MetaforceVersionInfo.hpp" #include "Tweaks/CTweakPlayerRes.hpp" #include "Tweaks/CTweakGunRes.hpp" #include "Tweaks/CTweakPlayer.hpp" @@ -49,7 +49,7 @@ #include "SnowForces.hpp" namespace DataSpec::DNAMP1 { -logvisor::Module Log("urde::DNAMP1"); +logvisor::Module Log("DataSpec::DNAMP1"); static bool GetNoShare(std::string_view name) { std::string lowerName(name); diff --git a/DataSpec/DNAMP1/EVNT.cpp b/DataSpec/DNAMP1/EVNT.cpp index 678eb1540..95d5c401c 100644 --- a/DataSpec/DNAMP1/EVNT.cpp +++ b/DataSpec/DNAMP1/EVNT.cpp @@ -23,6 +23,6 @@ void EVNT::Enumerate(typename Op::StreamT& s) { AT_SPECIALIZE_DNA_YAML(EVNT) -std::string_view EVNT::DNAType() { return "urde::DNAMP1::EVNT"sv; } +std::string_view EVNT::DNAType() { return "DNAMP1::EVNT"sv; } } // namespace DataSpec::DNAMP1 diff --git a/DataSpec/DNAMP1/MLVL.cpp b/DataSpec/DNAMP1/MLVL.cpp index 4eb5c1ee4..674a68ee9 100644 --- a/DataSpec/DNAMP1/MLVL.cpp +++ b/DataSpec/DNAMP1/MLVL.cpp @@ -269,7 +269,7 @@ bool MLVL::Cook(const hecl::ProjectPath& outPath, const hecl::ProjectPath& inPat std::vector depPaths; std::vector lazyPaths; for (std::unique_ptr& obj : layer.objects) { - if (obj->type == int(urde::EScriptObjectType::MemoryRelay)) { + if (obj->type == int(metaforce::EScriptObjectType::MemoryRelay)) { MemoryRelay& memRelay = static_cast(*obj); for (IScriptObject::Connection& conn : memRelay.connections) { MemRelayLink linkOut; @@ -319,7 +319,7 @@ bool MLVL::Cook(const hecl::ProjectPath& outPath, const hecl::ProjectPath& inPat areaOut.depLayers.push_back(areaOut.deps.size()); for (const std::pair& path : layer) { if (path.first) { - urde::SObjectTag tag = g_curSpec->buildTagFromPath(path.first); + metaforce::SObjectTag tag = g_curSpec->buildTagFromPath(path.first); if (tag.id.IsValid()) { if (path.second) areaOut.lazyDeps.emplace_back(tag.id.Value(), tag.type); @@ -348,7 +348,7 @@ bool MLVL::Cook(const hecl::ProjectPath& outPath, const hecl::ProjectPath& inPat layerResources.addSharedPath(path, false); for (const std::pair& path : layerResources.sharedPaths) { - urde::SObjectTag tag = g_curSpec->buildTagFromPath(path.first); + metaforce::SObjectTag tag = g_curSpec->buildTagFromPath(path.first); if (tag.id.IsValid()) { if (path.second) areaOut.lazyDeps.emplace_back(tag.id.Value(), tag.type); @@ -359,7 +359,7 @@ bool MLVL::Cook(const hecl::ProjectPath& outPath, const hecl::ProjectPath& inPat } hecl::ProjectPath pathPath = GetPathBeginsWith(areaDEnum, area.path, _SYS_STR("!path_")); - urde::SObjectTag pathTag = g_curSpec->buildTagFromPath(pathPath); + metaforce::SObjectTag pathTag = g_curSpec->buildTagFromPath(pathPath); if (pathTag.id.IsValid()) { areaOut.deps.emplace_back(pathTag.id.Value(), pathTag.type); areaOut.lazyDeps.emplace_back(0, FOURCC('NONE')); @@ -392,7 +392,7 @@ bool MLVL::Cook(const hecl::ProjectPath& outPath, const hecl::ProjectPath& inPat } bool MLVL::CookMAPW(const hecl::ProjectPath& outPath, const World& wld) { - std::vector mapaTags; + std::vector mapaTags; mapaTags.reserve(wld.areas.size()); for (const World::Area& area : wld.areas) { @@ -411,7 +411,7 @@ bool MLVL::CookMAPW(const hecl::ProjectPath& outPath, const World& wld) { fo.writeUint32Big(0xDEADF00D); fo.writeUint32Big(1); fo.writeUint32Big(mapaTags.size()); - for (const urde::SObjectTag& mapa : mapaTags) + for (const metaforce::SObjectTag& mapa : mapaTags) fo.writeUint32Big(u32(mapa.id.Value())); int64_t rem = fo.position() % 32; if (rem) @@ -479,7 +479,7 @@ bool MLVL::CookSAVW(const hecl::ProjectPath& outPath, const World& wld) { { std::vector scans; for (std::unique_ptr& obj : layer.objects) { - if (obj->type == int(urde::EScriptObjectType::MemoryRelay)) { + if (obj->type == int(metaforce::EScriptObjectType::MemoryRelay)) { MemoryRelay& memRelay = static_cast(*obj); auto iter = std::find(memRelays.begin(), memRelays.end(), memRelay.id); if (iter == memRelays.end()) { @@ -487,7 +487,7 @@ bool MLVL::CookSAVW(const hecl::ProjectPath& outPath, const World& wld) { savw.relays.push_back(memRelay.id); memRelays.push_back(memRelay.id); } - } else if (obj->type == int(urde::EScriptObjectType::SpecialFunction)) { + } else if (obj->type == int(metaforce::EScriptObjectType::SpecialFunction)) { SpecialFunction& specialFunc = static_cast(*obj); if (specialFunc.function == ESpecialFunctionType::CinematicSkip) savw.skippableCutscenes.push_back(specialFunc.id); @@ -497,7 +497,7 @@ bool MLVL::CookSAVW(const hecl::ProjectPath& outPath, const World& wld) { layer.areaId = specialFunc.layerSwitch.area; layer.layer = specialFunc.layerSwitch.layerIdx; } - } else if (obj->type == int(urde::EScriptObjectType::Door)) { + } else if (obj->type == int(metaforce::EScriptObjectType::Door)) { DoorArea& doorArea = static_cast(*obj); savw.doors.push_back(doorArea.id); } diff --git a/DataSpec/DNAMP1/SCAN.cpp b/DataSpec/DNAMP1/SCAN.cpp index c09371284..5fa82ce7c 100644 --- a/DataSpec/DNAMP1/SCAN.cpp +++ b/DataSpec/DNAMP1/SCAN.cpp @@ -66,7 +66,7 @@ void SCAN::Texture::Enumerate(typename WriteYaml::StreamT& w) w.writeFloat("fadeDuration", fadeDuration); } -std::string_view SCAN::Texture::DNAType() { return "urde::DNAMP1::SCAN::Texture"sv; } +std::string_view SCAN::Texture::DNAType() { return "DNAMP1::SCAN::Texture"sv; } template <> void SCAN::Texture::Enumerate(typename BinarySize::StreamT& s) { diff --git a/DataSpec/DNAMP1/SCLY.cpp b/DataSpec/DNAMP1/SCLY.cpp index 6e24003bf..d356a2d17 100644 --- a/DataSpec/DNAMP1/SCLY.cpp +++ b/DataSpec/DNAMP1/SCLY.cpp @@ -91,7 +91,7 @@ void SCLY::Enumerate(athena::io::YAMLDocWriter& docout) { docout.enumerate("layers", layers); } -std::string_view SCLY::DNAType() { return "urde::DNAMP1::SCLY"sv; } +std::string_view SCLY::DNAType() { return "DNAMP1::SCLY"sv; } template <> void SCLY::ScriptLayer::Enumerate(athena::io::IStreamReader& rs) { @@ -191,6 +191,6 @@ void SCLY::ScriptLayer::Enumerate(athena::io::YAMLDocWriter& } } -std::string_view SCLY::ScriptLayer::DNAType() { return "urde::DNAMP1::SCLY::ScriptLayer"sv; } +std::string_view SCLY::ScriptLayer::DNAType() { return "DNAMP1::SCLY::ScriptLayer"sv; } } // namespace DataSpec::DNAMP1 diff --git a/DataSpec/DNAMP1/STRG.cpp b/DataSpec/DNAMP1/STRG.cpp index 6e893b60c..7ba83bbad 100644 --- a/DataSpec/DNAMP1/STRG.cpp +++ b/DataSpec/DNAMP1/STRG.cpp @@ -458,5 +458,5 @@ void STRG::Enumerate(typename WriteYaml::StreamT& writer) { } } -std::string_view STRG::DNAType() { return "urde::DNAMP1::STRG"sv; } +std::string_view STRG::DNAType() { return "DNAMP1::STRG"sv; } } // namespace DataSpec::DNAMP1 diff --git a/DataSpec/DNAMP1/ScriptObjects/Oculus.cpp b/DataSpec/DNAMP1/ScriptObjects/Oculus.cpp index 662312cae..158db716f 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Oculus.cpp +++ b/DataSpec/DNAMP1/ScriptObjects/Oculus.cpp @@ -26,7 +26,7 @@ void Oculus::Enumerate(typename Op::StreamT& s) { unknown8 = 0.f; } -std::string_view Oculus::DNAType() { return "urde::DNAMP1::Oculus"sv; } +std::string_view Oculus::DNAType() { return "DNAMP1::Oculus"sv; } AT_SPECIALIZE_DNA_YAML(Oculus) diff --git a/DataSpec/DNAMP1/ScriptObjects/Ridley.cpp b/DataSpec/DNAMP1/ScriptObjects/Ridley.cpp index 919572ff2..1fff77f17 100644 --- a/DataSpec/DNAMP1/ScriptObjects/Ridley.cpp +++ b/DataSpec/DNAMP1/ScriptObjects/Ridley.cpp @@ -61,7 +61,7 @@ void Ridley::Enumerate(typename Op::StreamT& s) { Do(athena::io::PropId{"damageInfo9"}, damageInfo9, s); } -std::string_view Ridley::DNAType() { return "urde::DNAMP1::Ridley"sv; } +std::string_view Ridley::DNAType() { return "DNAMP1::Ridley"sv; } AT_SPECIALIZE_DNA_YAML(Ridley) diff --git a/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.cpp b/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.cpp index b6bb0269a..54fcd60b0 100644 --- a/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.cpp +++ b/DataSpec/DNAMP1/ScriptObjects/WorldTeleporter.cpp @@ -41,7 +41,7 @@ void WorldTeleporter::Enumerate(typename Op::StreamT& s) { } } -std::string_view WorldTeleporter::DNAType() { return "urde::DNAMP1::WorldTeleporter"sv; } +std::string_view WorldTeleporter::DNAType() { return "DNAMP1::WorldTeleporter"sv; } AT_SPECIALIZE_DNA_YAML(WorldTeleporter) diff --git a/DataSpec/DNAMP2/ANCS.cpp b/DataSpec/DNAMP2/ANCS.cpp index a9f6b644b..512722d1a 100644 --- a/DataSpec/DNAMP2/ANCS.cpp +++ b/DataSpec/DNAMP2/ANCS.cpp @@ -347,7 +347,7 @@ void ANCS::CharacterSet::CharacterInfo::Enumerate(typename Wr } std::string_view ANCS::CharacterSet::CharacterInfo::DNAType() { - return "urde::DNAMP2::ANCS::CharacterSet::CharacterInfo"sv; + return "DNAMP2::ANCS::CharacterSet::CharacterInfo"sv; } template <> @@ -523,7 +523,7 @@ void ANCS::AnimationSet::Enumerate(typename WriteYaml::Stream } } -std::string_view ANCS::AnimationSet::DNAType() { return "urde::DNAMP2::ANCS::AnimationSet"sv; } +std::string_view ANCS::AnimationSet::DNAType() { return "DNAMP2::ANCS::AnimationSet"sv; } template void ANCS::AnimationSet::EVNT::Enumerate(typename Op::StreamT& s) { @@ -542,6 +542,6 @@ void ANCS::AnimationSet::EVNT::Enumerate(typename Op::StreamT& s) { AT_SPECIALIZE_DNA(ANCS::AnimationSet::EVNT) -std::string_view ANCS::AnimationSet::EVNT::DNAType() { return "urde::DNAMP2::ANCS::AnimationSet::EVNT"sv; } +std::string_view ANCS::AnimationSet::EVNT::DNAType() { return "DNAMP2::ANCS::AnimationSet::EVNT"sv; } } // namespace DataSpec::DNAMP2 diff --git a/DataSpec/DNAMP2/DNAMP2.cpp b/DataSpec/DNAMP2/DNAMP2.cpp index dd08e1b78..709971698 100644 --- a/DataSpec/DNAMP2/DNAMP2.cpp +++ b/DataSpec/DNAMP2/DNAMP2.cpp @@ -22,7 +22,7 @@ #include "Runtime/GCNTypes.hpp" namespace DataSpec::DNAMP2 { -logvisor::Module Log("urde::DNAMP2"); +logvisor::Module Log("DataSpec::DNAMP2"); static bool GetNoShare(std::string_view name) { std::string lowerName(name); diff --git a/DataSpec/DNAMP2/STRG.cpp b/DataSpec/DNAMP2/STRG.cpp index 16c0632f1..f678d4fc0 100644 --- a/DataSpec/DNAMP2/STRG.cpp +++ b/DataSpec/DNAMP2/STRG.cpp @@ -213,6 +213,6 @@ void STRG::Enumerate(athena::io::YAMLDocWriter& writer) { } } -std::string_view STRG::DNAType() { return "urde::DNAMP2::STRG"sv; } +std::string_view STRG::DNAType() { return "DNAMP2::STRG"sv; } } // namespace DataSpec::DNAMP2 diff --git a/DataSpec/DNAMP3/CHAR.cpp b/DataSpec/DNAMP3/CHAR.cpp index 2f7324128..c9318d5d1 100644 --- a/DataSpec/DNAMP3/CHAR.cpp +++ b/DataSpec/DNAMP3/CHAR.cpp @@ -69,7 +69,7 @@ void CHAR::AnimationInfo::EVNT::SFXEvent::Enumerate(athena::i } std::string_view CHAR::AnimationInfo::EVNT::SFXEvent::DNAType() { - return "urde::DNAMP3::CHAR::AnimationInfo::EVNT::SFXEvent"sv; + return "DNAMP3::CHAR::AnimationInfo::EVNT::SFXEvent"sv; } template <> @@ -151,7 +151,7 @@ void CHAR::AnimationInfo::MetaAnimFactory::Enumerate(athena:: } std::string_view CHAR::AnimationInfo::MetaAnimFactory::DNAType() { - return "urde::DNAMP3::CHAR::AnimationInfo::MetaAnimFactory"sv; + return "DNAMP3::CHAR::AnimationInfo::MetaAnimFactory"sv; } } // namespace DataSpec::DNAMP3 diff --git a/DataSpec/DNAMP3/DNAMP3.cpp b/DataSpec/DNAMP3/DNAMP3.cpp index 873e6a0b2..0a284b06d 100644 --- a/DataSpec/DNAMP3/DNAMP3.cpp +++ b/DataSpec/DNAMP3/DNAMP3.cpp @@ -19,7 +19,7 @@ #include "Runtime/GCNTypes.hpp" namespace DataSpec::DNAMP3 { -logvisor::Module Log("urde::DNAMP3"); +logvisor::Module Log("DataSpec::DNAMP3"); static bool GetNoShare(std::string_view name) { std::string lowerName(name); diff --git a/DataSpec/DNAMP3/STRG.cpp b/DataSpec/DNAMP3/STRG.cpp index b40dd735d..e1b7906bc 100644 --- a/DataSpec/DNAMP3/STRG.cpp +++ b/DataSpec/DNAMP3/STRG.cpp @@ -220,6 +220,6 @@ void STRG::Enumerate(athena::io::YAMLDocWriter& writer) { } } -std::string_view STRG::DNAType() { return "urde::DNAMP3::STRG"sv; } +std::string_view STRG::DNAType() { return "DNAMP3::STRG"sv; } } // namespace DataSpec::DNAMP3 diff --git a/DataSpec/SpecBase.cpp b/DataSpec/SpecBase.cpp index e17001971..8329e2468 100644 --- a/DataSpec/SpecBase.cpp +++ b/DataSpec/SpecBase.cpp @@ -8,7 +8,7 @@ #include "DataSpec/DNACommon/DNACommon.hpp" #include "DataSpec/DNACommon/TXTR.hpp" #include "DataSpec/AssetNameMap.hpp" -#include "DataSpec/DNACommon/URDEVersionInfo.hpp" +#include "DataSpec/DNACommon/MetaforceVersionInfo.hpp" #include "hecl/ClientProcess.hpp" #include "nod/DiscBase.hpp" #include "nod/nod.hpp" @@ -22,7 +22,7 @@ namespace DataSpec { -static logvisor::Module Log("urde::SpecBase"); +static logvisor::Module Log("DataSpec::SpecBase"); static const hecl::SystemChar* MomErr[] = {_SYS_STR("Your metroid is in another castle"), _SYS_STR("HECL is experiencing a PTSD attack"), @@ -441,8 +441,8 @@ bool SpecBase::canPackage(const hecl::ProjectPath& path) { return path.isFile() || path.isDirectory(); } -void SpecBase::recursiveBuildResourceList(std::vector& listOut, - std::unordered_set& addedTags, +void SpecBase::recursiveBuildResourceList(std::vector& listOut, + std::unordered_set& addedTags, const hecl::ProjectPath& path, hecl::blender::Token& btok) { hecl::DirectoryEnumerator dEnum(path.getAbsolutePath(), hecl::DirectoryEnumerator::Mode::DirsThenFilesSorted, false, false, true); @@ -452,7 +452,7 @@ void SpecBase::recursiveBuildResourceList(std::vector& listOut if (hecl::ProjectPath(childPath, _SYS_STR("!project.yaml")).isFile() && hecl::ProjectPath(childPath, _SYS_STR("!pool.yaml")).isFile()) { /* Handle AudioGroup case */ - if (urde::SObjectTag tag = tagFromPath(childPath)) { + if (metaforce::SObjectTag tag = tagFromPath(childPath)) { if (addedTags.find(tag) != addedTags.end()) continue; addedTags.insert(tag); @@ -466,7 +466,7 @@ void SpecBase::recursiveBuildResourceList(std::vector& listOut std::vector subPaths; flattenDependencies(childPath, subPaths, btok); for (const auto& subPath : subPaths) { - if (urde::SObjectTag tag = tagFromPath(subPath)) { + if (metaforce::SObjectTag tag = tagFromPath(subPath)) { if (addedTags.find(tag) != addedTags.end()) continue; addedTags.insert(tag); @@ -478,10 +478,10 @@ void SpecBase::recursiveBuildResourceList(std::vector& listOut } void SpecBase::copyBuildListData(std::vector>& fileIndex, - const std::vector& buildList, + const std::vector& buildList, const hecl::Database::DataSpecEntry* entry, bool fast, const hecl::MultiProgressPrinter& progress, athena::io::FileWriter& pakOut, - const std::unordered_map>& mlvlData) { + const std::unordered_map>& mlvlData) { fileIndex.reserve(buildList.size()); int loadIdx = 0; for (const auto& tag : buildList) { @@ -564,9 +564,9 @@ void SpecBase::doPackage(const hecl::ProjectPath& path, const hecl::Database::Da /* Output file */ athena::io::FileWriter pakOut(outPath.getAbsolutePath()); - std::vector buildList; + std::vector buildList; atUint64 resTableOffset = 0; - std::unordered_map> mlvlData; + std::unordered_map> mlvlData; if (IsWorldBlend(path)) /* World PAK */ { @@ -583,9 +583,9 @@ void SpecBase::doPackage(const hecl::ProjectPath& path, const hecl::Database::Da } else if (path.getPathType() == hecl::ProjectPath::Type::Directory) /* General PAK */ { /* Build resource list */ - std::unordered_set addedTags; + std::unordered_set addedTags; recursiveBuildResourceList(buildList, addedTags, path, btok); - std::vector> nameList; + std::vector> nameList; /* Build name list */ for (const auto& item : buildList) { @@ -605,10 +605,10 @@ void SpecBase::doPackage(const hecl::ProjectPath& path, const hecl::Database::Da /* Build resource list */ std::vector subPaths; flattenDependencies(path, subPaths, btok); - std::unordered_set addedTags; - std::vector> nameList; + std::unordered_set addedTags; + std::vector> nameList; for (const auto& subPath : subPaths) { - if (urde::SObjectTag tag = tagFromPath(subPath)) { + if (metaforce::SObjectTag tag = tagFromPath(subPath)) { if (addedTags.find(tag) != addedTags.end()) continue; addedTags.insert(tag); @@ -635,12 +635,12 @@ void SpecBase::doPackage(const hecl::ProjectPath& path, const hecl::Database::Da if (cp) { Log.report(logvisor::Info, FMT_STRING(_SYS_STR("Validating resources"))); progress.setMainIndeterminate(true); - std::vector cookTags; + std::vector cookTags; cookTags.reserve(buildList.size()); /* Ensure CMDLs are enqueued first to minimize synchronous dependency cooking */ for (int i = 0; i < 2; ++i) { - std::unordered_set addedTags; + std::unordered_set addedTags; addedTags.reserve(buildList.size()); for (auto& tag : buildList) { if ((i == 0 && tag.type == FOURCC('CMDL')) || (i == 1 && tag.type != FOURCC('CMDL'))) { @@ -732,7 +732,7 @@ void SpecBase::extractRandomStaticEntropy(const uint8_t* buf, const hecl::Projec png_infop info = png_create_info_struct(png); png_text textStruct = {}; - textStruct.key = png_charp("urde_nomip"); + textStruct.key = png_charp("meta_nomip"); png_set_text(png, info, &textStruct, 1); png_set_IHDR(png, info, 1024, 512, 8, PNG_COLOR_TYPE_GRAY_ALPHA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, @@ -761,7 +761,7 @@ void SpecBase::clearTagCache() { m_catalogTagToNames.clear(); } -hecl::ProjectPath SpecBase::pathFromTag(const urde::SObjectTag& tag) const { +hecl::ProjectPath SpecBase::pathFromTag(const metaforce::SObjectTag& tag) const { std::unique_lock lk(m_backgroundIndexMutex); auto search = m_tagToPath.find(tag); if (search != m_tagToPath.cend()) @@ -769,14 +769,14 @@ hecl::ProjectPath SpecBase::pathFromTag(const urde::SObjectTag& tag) const { return {}; } -urde::SObjectTag SpecBase::tagFromPath(const hecl::ProjectPath& path) const { +metaforce::SObjectTag SpecBase::tagFromPath(const hecl::ProjectPath& path) const { auto search = m_pathToTag.find(path.hash()); if (search != m_pathToTag.cend()) return search->second; return buildTagFromPath(path); } -bool SpecBase::waitForTagReady(const urde::SObjectTag& tag, const hecl::ProjectPath*& pathOut) { +bool SpecBase::waitForTagReady(const metaforce::SObjectTag& tag, const hecl::ProjectPath*& pathOut) { std::unique_lock lk(m_backgroundIndexMutex); auto search = m_tagToPath.find(tag); if (search == m_tagToPath.end()) { @@ -799,7 +799,7 @@ bool SpecBase::waitForTagReady(const urde::SObjectTag& tag, const hecl::ProjectP return true; } -const urde::SObjectTag* SpecBase::getResourceIdByName(std::string_view name) const { +const metaforce::SObjectTag* SpecBase::getResourceIdByName(std::string_view name) const { std::string lower(name); std::transform(lower.cbegin(), lower.cend(), lower.begin(), tolower); @@ -823,12 +823,12 @@ const urde::SObjectTag* SpecBase::getResourceIdByName(std::string_view name) con return &search->second; } -FourCC SpecBase::getResourceTypeById(urde::CAssetId id) const { +FourCC SpecBase::getResourceTypeById(metaforce::CAssetId id) const { if (!id.IsValid()) return {}; std::unique_lock lk(m_backgroundIndexMutex); - urde::SObjectTag searchTag = {FourCC(), id}; + metaforce::SObjectTag searchTag = {FourCC(), id}; auto search = m_tagToPath.find(searchTag); if (search == m_tagToPath.end()) { if (m_backgroundRunning) { @@ -849,7 +849,7 @@ FourCC SpecBase::getResourceTypeById(urde::CAssetId id) const { return search->first.type; } -void SpecBase::enumerateResources(const std::function& lambda) const { +void SpecBase::enumerateResources(const std::function& lambda) const { waitForIndexComplete(); for (const auto& pair : m_tagToPath) { if (!lambda(pair.first)) @@ -858,7 +858,7 @@ void SpecBase::enumerateResources(const std::function& lambda) const { + const std::function& lambda) const { waitForIndexComplete(); for (const auto& pair : m_catalogNameToTag) { if (!lambda(pair.first, pair.second)) @@ -866,7 +866,7 @@ void SpecBase::enumerateNamedResources( } } -static void WriteTag(athena::io::YAMLDocWriter& cacheWriter, const urde::SObjectTag& pathTag, +static void WriteTag(athena::io::YAMLDocWriter& cacheWriter, const metaforce::SObjectTag& pathTag, const hecl::ProjectPath& path) { auto key = fmt::format(FMT_STRING("{}"), pathTag.id); if (auto* existing = cacheWriter.getCurNode()->findMapChild(key)) { @@ -877,7 +877,7 @@ static void WriteTag(athena::io::YAMLDocWriter& cacheWriter, const urde::SObject } } -static void WriteNameTag(athena::io::YAMLDocWriter& nameWriter, const urde::SObjectTag& pathTag, +static void WriteNameTag(athena::io::YAMLDocWriter& nameWriter, const metaforce::SObjectTag& pathTag, std::string_view name) { nameWriter.writeString(name.data(), fmt::format(FMT_STRING("{}"), pathTag.id)); } @@ -915,7 +915,7 @@ void SpecBase::readCatalog(const hecl::ProjectPath& catalogPath, athena::io::YAM } if (path.isNone()) continue; - urde::SObjectTag pathTag = tagFromPath(path); + metaforce::SObjectTag pathTag = tagFromPath(path); if (pathTag) { std::unique_lock lk(m_backgroundIndexMutex); m_catalogNameToTag[pLower] = pathTag; @@ -956,7 +956,7 @@ void SpecBase::backgroundIndexRecursiveCatalogs(const hecl::ProjectPath& dir, at } } -void SpecBase::insertPathTag(athena::io::YAMLDocWriter& cacheWriter, const urde::SObjectTag& tag, +void SpecBase::insertPathTag(athena::io::YAMLDocWriter& cacheWriter, const metaforce::SObjectTag& tag, const hecl::ProjectPath& path, bool dump) { #if 0 auto search = m_tagToPath.find(tag); @@ -989,7 +989,7 @@ bool SpecBase::addFileToIndex(const hecl::ProjectPath& path, athena::io::YAMLDoc return true; /* Classify intermediate into tag */ - urde::SObjectTag pathTag = buildTagFromPath(path); + metaforce::SObjectTag pathTag = buildTagFromPath(path); if (pathTag) { std::unique_lock lk{m_backgroundIndexMutex}; bool useGlob = false; @@ -1085,7 +1085,7 @@ void SpecBase::backgroundIndexRecursiveProc(const hecl::ProjectPath& dir, athena if (hecl::ProjectPath(path, "!project.yaml").isFile() && hecl::ProjectPath(path, "!pool.yaml").isFile()) { /* Avoid redundant filesystem access for re-caches */ if (m_pathToTag.find(path.hash()) == m_pathToTag.cend()) { - urde::SObjectTag pathTag(SBIG('AGSC'), path.parsedHash32()); + metaforce::SObjectTag pathTag(SBIG('AGSC'), path.parsedHash32()); insertPathTag(cacheWriter, pathTag, path); } } else { @@ -1138,7 +1138,7 @@ void SpecBase::backgroundIndexProc() { if (node.m_seqChildren.size() >= 2) { unsigned long id = strtoul(child.first.c_str(), nullptr, 16); hecl::FourCC type(node.m_seqChildren[0]->m_scalarString.c_str()); - urde::SObjectTag pathTag(type, id); + metaforce::SObjectTag pathTag(type, id); for (auto I = node.m_seqChildren.begin() + 1, E = node.m_seqChildren.end(); I != E; ++I) { hecl::ProjectPath path(m_project.getProjectWorkingPath(), (*I)->m_scalarString); if (!path.isNone()) @@ -1166,7 +1166,7 @@ void SpecBase::backgroundIndexProc() { m_catalogTagToNames.reserve(nameReader.getRootNode()->m_mapChildren.size()); for (const auto& child : nameReader.getRootNode()->m_mapChildren) { unsigned long id = strtoul(child.second->m_scalarString.c_str(), nullptr, 16); - auto search = m_tagToPath.find(urde::SObjectTag(FourCC(), uint32_t(id))); + auto search = m_tagToPath.find(metaforce::SObjectTag(FourCC(), uint32_t(id))); if (search != m_tagToPath.cend()) { std::string chLower = child.first; std::transform(chLower.cbegin(), chLower.cend(), chLower.begin(), tolower); @@ -1224,7 +1224,7 @@ void SpecBase::WriteVersionInfo(hecl::Database::Project& project, const hecl::Pr hecl::ProjectPath versionPath(pakPath, _SYS_STR("version.yaml")); versionPath.makeDirChain(false); - URDEVersionInfo info; + MetaforceVersionInfo info; info.version = m_version; info.region = m_region; info.game = m_game; diff --git a/DataSpec/SpecBase.hpp b/DataSpec/SpecBase.hpp index 00a41d7b3..f9e99bee7 100644 --- a/DataSpec/SpecBase.hpp +++ b/DataSpec/SpecBase.hpp @@ -57,7 +57,7 @@ struct SpecBase : hecl::Database::IDataSpec { virtual bool extractFromDisc(nod::DiscBase& disc, bool force, const hecl::MultiProgressPrinter& progress) = 0; /* Convert path to object tag */ - virtual urde::SObjectTag buildTagFromPath(const hecl::ProjectPath& path) const = 0; + virtual metaforce::SObjectTag buildTagFromPath(const hecl::ProjectPath& path) const = 0; /* Even if PC spec is being cooked, this will return the vanilla GCN spec */ virtual const hecl::Database::DataSpecEntry& getOriginalSpec() const = 0; @@ -121,15 +121,15 @@ struct SpecBase : hecl::Database::IDataSpec { virtual void buildWorldPakList(const hecl::ProjectPath& worldPath, const hecl::ProjectPath& worldPathCooked, hecl::blender::Token& btok, athena::io::FileWriter& w, - std::vector& listOut, atUint64& resTableOffset, - std::unordered_map>& mlvlData) {} + std::vector& listOut, atUint64& resTableOffset, + std::unordered_map>& mlvlData) {} virtual void buildPakList(hecl::blender::Token& btok, athena::io::FileWriter& w, - const std::vector& list, - const std::vector>& nameList, + const std::vector& list, + const std::vector>& nameList, atUint64& resTableOffset) {} - virtual void writePakFileIndex(athena::io::FileWriter& w, const std::vector& tags, + virtual void writePakFileIndex(athena::io::FileWriter& w, const std::vector& tags, const std::vector>& index, atUint64 resTableOffset) {} - virtual std::pair, size_t> compressPakData(const urde::SObjectTag& tag, + virtual std::pair, size_t> compressPakData(const metaforce::SObjectTag& tag, const uint8_t* data, size_t len) { return {}; } @@ -149,19 +149,19 @@ struct SpecBase : hecl::Database::IDataSpec { void extractRandomStaticEntropy(const uint8_t* buf, const hecl::ProjectPath& pakPath); /* Tag cache functions */ - urde::SObjectTag tagFromPath(const hecl::ProjectPath& path) const; - hecl::ProjectPath pathFromTag(const urde::SObjectTag& tag) const; - bool waitForTagReady(const urde::SObjectTag& tag, const hecl::ProjectPath*& pathOut); - const urde::SObjectTag* getResourceIdByName(std::string_view name) const; - hecl::FourCC getResourceTypeById(urde::CAssetId id) const; - void enumerateResources(const std::function& lambda) const; - void enumerateNamedResources(const std::function& lambda) const; + metaforce::SObjectTag tagFromPath(const hecl::ProjectPath& path) const; + hecl::ProjectPath pathFromTag(const metaforce::SObjectTag& tag) const; + bool waitForTagReady(const metaforce::SObjectTag& tag, const hecl::ProjectPath*& pathOut); + const metaforce::SObjectTag* getResourceIdByName(std::string_view name) const; + hecl::FourCC getResourceTypeById(metaforce::CAssetId id) const; + void enumerateResources(const std::function& lambda) const; + void enumerateNamedResources(const std::function& lambda) const; void cancelBackgroundIndex(); void beginBackgroundIndex(); bool backgroundIndexRunning() const { return m_backgroundRunning; } void waitForIndexComplete() const; - virtual void getTagListForFile(const char* pakName, std::vector& out) const {} + virtual void getTagListForFile(const char* pakName, std::vector& out) const {} SpecBase(const hecl::Database::DataSpecEntry* specEntry, hecl::Database::Project& project, bool pc); ~SpecBase(); @@ -171,10 +171,10 @@ protected: bool m_pc; hecl::ProjectPath m_masterShader; - std::unordered_multimap m_tagToPath; - std::unordered_map m_pathToTag; - std::unordered_map m_catalogNameToTag; - std::unordered_map> m_catalogTagToNames; + std::unordered_multimap m_tagToPath; + std::unordered_map m_pathToTag; + std::unordered_map m_catalogNameToTag; + std::unordered_map> m_catalogTagToNames; void clearTagCache(); hecl::blender::Token m_backgroundBlender; @@ -183,7 +183,7 @@ protected: bool m_backgroundRunning = false; void readCatalog(const hecl::ProjectPath& catalogPath, athena::io::YAMLDocWriter& nameWriter); - void insertPathTag(athena::io::YAMLDocWriter& cacheWriter, const urde::SObjectTag& tag, const hecl::ProjectPath& path, + void insertPathTag(athena::io::YAMLDocWriter& cacheWriter, const metaforce::SObjectTag& tag, const hecl::ProjectPath& path, bool dump = true); bool addFileToIndex(const hecl::ProjectPath& path, athena::io::YAMLDocWriter& cacheWriter); void backgroundIndexRecursiveProc(const hecl::ProjectPath& path, athena::io::YAMLDocWriter& cacheWriter, @@ -192,13 +192,13 @@ protected: int level); void backgroundIndexProc(); - void recursiveBuildResourceList(std::vector& listOut, - std::unordered_set& addedTags, const hecl::ProjectPath& path, + void recursiveBuildResourceList(std::vector& listOut, + std::unordered_set& addedTags, const hecl::ProjectPath& path, hecl::blender::Token& btok); void copyBuildListData(std::vector>& fileIndex, - const std::vector& buildList, const hecl::Database::DataSpecEntry* entry, + const std::vector& buildList, const hecl::Database::DataSpecEntry* entry, bool fast, const hecl::MultiProgressPrinter& progress, athena::io::FileWriter& pakOut, - const std::unordered_map>& mlvlData); + const std::unordered_map>& mlvlData); std::unique_ptr m_disc; bool m_isWii{}; diff --git a/DataSpec/SpecMP1.cpp b/DataSpec/SpecMP1.cpp index 291617562..f0f082ddb 100644 --- a/DataSpec/SpecMP1.cpp +++ b/DataSpec/SpecMP1.cpp @@ -29,7 +29,7 @@ #include "DNACommon/DPSC.hpp" #include "DNACommon/DGRP.hpp" #include "DNACommon/MAPU.hpp" -#include "DNACommon/URDEVersionInfo.hpp" +#include "DNACommon/MetaforceVersionInfo.hpp" #include "DNACommon/Tweaks/TweakWriter.hpp" #include "DNAMP1/Tweaks/CTweakPlayerRes.hpp" #include "DNAMP1/Tweaks/CTweakGunRes.hpp" @@ -57,7 +57,7 @@ namespace DataSpec { using namespace std::literals; -static logvisor::Module Log("urde::SpecMP1"); +static logvisor::Module Log("metaforce::SpecMP1"); extern hecl::Database::DataSpecEntry SpecEntMP1; extern hecl::Database::DataSpecEntry SpecEntMP1PC; extern hecl::Database::DataSpecEntry SpecEntMP1ORIG; @@ -473,7 +473,7 @@ struct SpecMP1 : SpecBase { }); } - urde::SObjectTag buildTagFromPath(const hecl::ProjectPath& path) const override { + metaforce::SObjectTag buildTagFromPath(const hecl::ProjectPath& path) const override { if (hecl::StringUtils::EndsWith(path.getAuxInfo(), _SYS_STR(".CSKR"))) return {SBIG('CSKR'), path.parsedHash32()}; else if (hecl::StringUtils::EndsWith(path.getAuxInfo(), _SYS_STR(".ANIM"))) @@ -542,7 +542,7 @@ struct SpecMP1 : SpecBase { athena::io::YAMLDocReader reader; yaml_parser_set_input_file(reader.getParser(), fp.get()); - urde::SObjectTag resTag; + metaforce::SObjectTag resTag; if (reader.ClassTypeOperation([&](std::string_view className) { if (className == DNAParticle::GPSM::DNAType()) { resTag.type = SBIG('PART'); @@ -634,7 +634,7 @@ struct SpecMP1 : SpecBase { return {}; } - void getTagListForFile(const char* pakName, std::vector& out) const override { + void getTagListForFile(const char* pakName, std::vector& out) const override { std::string pathPrefix("MP1/"); pathPrefix += pakName; pathPrefix += '/'; @@ -992,9 +992,9 @@ struct SpecMP1 : SpecBase { } void buildWorldPakList(const hecl::ProjectPath& worldPath, const hecl::ProjectPath& worldPathCooked, - hecl::blender::Token& btok, athena::io::FileWriter& w, std::vector& listOut, + hecl::blender::Token& btok, athena::io::FileWriter& w, std::vector& listOut, atUint64& resTableOffset, - std::unordered_map>& mlvlData) override { + std::unordered_map>& mlvlData) override { DNAMP1::MLVL mlvl; { athena::io::FileReader r(worldPathCooked.getAbsolutePath()); @@ -1016,7 +1016,7 @@ struct SpecMP1 : SpecBase { } listOut.reserve(count); - urde::SObjectTag worldTag = tagFromPath(worldPath.getWithExtension(_SYS_STR(".*"), true)); + metaforce::SObjectTag worldTag = tagFromPath(worldPath.getWithExtension(_SYS_STR(".*"), true)); w.writeUint32Big(m_pc ? 0x80030005 : 0x00030005); w.writeUint32Big(0); @@ -1030,19 +1030,19 @@ struct SpecMP1 : SpecBase { nameEnt.name = parentDir.getLastComponentUTF8(); nameEnt.write(w); - std::unordered_set addedTags; + std::unordered_set addedTags; for (auto& area : mlvl.areas) { - urde::SObjectTag areaTag(FOURCC('MREA'), area.areaMREAId.toUint64()); + metaforce::SObjectTag areaTag(FOURCC('MREA'), area.areaMREAId.toUint64()); bool dupeRes = false; if (hecl::ProjectPath areaDir = pathFromTag(areaTag).getParentPath()) dupeRes = hecl::ProjectPath(areaDir, _SYS_STR("!duperes")).isFile(); - urde::SObjectTag nameTag(FOURCC('STRG'), area.areaNameId.toUint64()); + metaforce::SObjectTag nameTag(FOURCC('STRG'), area.areaNameId.toUint64()); if (nameTag) listOut.push_back(nameTag); for (const auto& dep : area.deps) { - urde::CAssetId newId = dep.id.toUint64(); + metaforce::CAssetId newId = dep.id.toUint64(); if (dupeRes || addedTags.find(newId) == addedTags.end()) { listOut.emplace_back(dep.type, newId); addedTags.insert(newId); @@ -1077,18 +1077,18 @@ struct SpecMP1 : SpecBase { area.depLayers = std::move(strippedDepLayers); } - urde::SObjectTag nameTag(FOURCC('STRG'), mlvl.worldNameId.toUint64()); + metaforce::SObjectTag nameTag(FOURCC('STRG'), mlvl.worldNameId.toUint64()); if (nameTag) listOut.push_back(nameTag); - urde::SObjectTag savwTag(FOURCC('SAVW'), mlvl.saveWorldId.toUint64()); + metaforce::SObjectTag savwTag(FOURCC('SAVW'), mlvl.saveWorldId.toUint64()); if (savwTag) { if (hecl::ProjectPath savwPath = pathFromTag(savwTag)) m_project.cookPath(savwPath, {}, false, true); listOut.push_back(savwTag); } - urde::SObjectTag mapTag(FOURCC('MAPW'), mlvl.worldMap.toUint64()); + metaforce::SObjectTag mapTag(FOURCC('MAPW'), mlvl.worldMap.toUint64()); if (mapTag) { if (hecl::ProjectPath mapPath = pathFromTag(mapTag)) { m_project.cookPath(mapPath, {}, false, true); @@ -1111,7 +1111,7 @@ struct SpecMP1 : SpecBase { listOut.push_back(mapTag); } - urde::SObjectTag skyboxTag(FOURCC('CMDL'), mlvl.worldSkyboxId.toUint64()); + metaforce::SObjectTag skyboxTag(FOURCC('CMDL'), mlvl.worldSkyboxId.toUint64()); if (skyboxTag) { listOut.push_back(skyboxTag); hecl::ProjectPath skyboxPath = pathFromTag(skyboxTag); @@ -1119,7 +1119,7 @@ struct SpecMP1 : SpecBase { auto data = btok.getBlenderConnection().beginData(); std::vector textures = data.getTextures(); for (const auto& tex : textures) { - urde::SObjectTag texTag = tagFromPath(tex); + metaforce::SObjectTag texTag = tagFromPath(tex); if (!texTag) Log.report(logvisor::Fatal, FMT_STRING(_SYS_STR("Unable to resolve {}")), tex.getRelativePath()); listOut.push_back(texTag); @@ -1151,8 +1151,8 @@ struct SpecMP1 : SpecBase { } } - void buildPakList(hecl::blender::Token& btok, athena::io::FileWriter& w, const std::vector& list, - const std::vector>& nameList, + void buildPakList(hecl::blender::Token& btok, athena::io::FileWriter& w, const std::vector& list, + const std::vector>& nameList, atUint64& resTableOffset) override { w.writeUint32Big(m_pc ? 0x80030005 : 0x00030005); w.writeUint32Big(0); @@ -1180,13 +1180,13 @@ struct SpecMP1 : SpecBase { } } - void writePakFileIndex(athena::io::FileWriter& w, const std::vector& tags, + void writePakFileIndex(athena::io::FileWriter& w, const std::vector& tags, const std::vector>& index, atUint64 resTableOffset) override { w.seek(resTableOffset, athena::SeekOrigin::Begin); auto it = tags.begin(); for (const auto& item : index) { - const urde::SObjectTag& tag = *it++; + const metaforce::SObjectTag& tag = *it++; DNAMP1::PAK::Entry ent; ent.compressed = atUint32(std::get<2>(item)); ent.type = tag.type; @@ -1197,7 +1197,7 @@ struct SpecMP1 : SpecBase { } } - std::pair, size_t> compressPakData(const urde::SObjectTag& tag, const uint8_t* data, + std::pair, size_t> compressPakData(const metaforce::SObjectTag& tag, const uint8_t* data, size_t len) override { bool doCompress = false; switch (tag.type.toUint32()) { diff --git a/DataSpec/SpecMP2.cpp b/DataSpec/SpecMP2.cpp index fe2975f63..f2280fd99 100644 --- a/DataSpec/SpecMP2.cpp +++ b/DataSpec/SpecMP2.cpp @@ -12,7 +12,7 @@ #include "DNACommon/MAPU.hpp" #include "DNACommon/PATH.hpp" #include "DNACommon/TXTR.hpp" -#include "DNACommon/URDEVersionInfo.hpp" +#include "DNACommon/MetaforceVersionInfo.hpp" #include "hecl/ClientProcess.hpp" #include "hecl/Blender/Connection.hpp" @@ -25,7 +25,7 @@ namespace DataSpec { using namespace std::literals; -static logvisor::Module Log("urde::SpecMP2"); +static logvisor::Module Log("metaforce::SpecMP2"); extern hecl::Database::DataSpecEntry SpecEntMP2; extern hecl::Database::DataSpecEntry SpecEntMP2ORIG; @@ -350,7 +350,7 @@ struct SpecMP2 : SpecBase { }); } - urde::SObjectTag buildTagFromPath(const hecl::ProjectPath& path) const override { return {}; } + metaforce::SObjectTag buildTagFromPath(const hecl::ProjectPath& path) const override { return {}; } void cookMesh(const hecl::ProjectPath& out, const hecl::ProjectPath& in, BlendStream& ds, bool fast, hecl::blender::Token& btok, FCookProgress progress) override {} diff --git a/DataSpec/SpecMP3.cpp b/DataSpec/SpecMP3.cpp index 67e99ceaa..f86c75e55 100644 --- a/DataSpec/SpecMP3.cpp +++ b/DataSpec/SpecMP3.cpp @@ -9,7 +9,7 @@ #include "DataSpec/DNAMP3/MAPA.hpp" #include "DataSpec/DNAMP2/STRG.hpp" #include "DataSpec/DNACommon/TXTR.hpp" -#include "DataSpec/DNACommon/URDEVersionInfo.hpp" +#include "DataSpec/DNACommon/MetaforceVersionInfo.hpp" #include "hecl/ClientProcess.hpp" #include "hecl/Blender/Connection.hpp" @@ -22,7 +22,7 @@ namespace DataSpec { using namespace std::literals; -static logvisor::Module Log("urde::SpecMP3"); +static logvisor::Module Log("metaforce::SpecMP3"); extern hecl::Database::DataSpecEntry SpecEntMP3; extern hecl::Database::DataSpecEntry SpecEntMP3ORIG; @@ -516,7 +516,7 @@ struct SpecMP3 : SpecBase { return false; } - urde::SObjectTag buildTagFromPath(const hecl::ProjectPath& path) const override { return {}; } + metaforce::SObjectTag buildTagFromPath(const hecl::ProjectPath& path) const override { return {}; } void cookMesh(const hecl::ProjectPath& out, const hecl::ProjectPath& in, BlendStream& ds, bool fast, hecl::blender::Token& btok, FCookProgress progress) override {} diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt index 5c6e29fb1..ff2aaa1bf 100644 --- a/Editor/CMakeLists.txt +++ b/Editor/CMakeLists.txt @@ -5,8 +5,8 @@ add_subdirectory(badging) unset(URDE_PLAT_LIBS) if(WIN32) - configure_file(platforms/win/urde.rc.in "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/urde.rc" @ONLY) - set(PLAT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/urde.rc" platforms/win/urde.manifest) + configure_file(platforms/win/metaforce.rc.in "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/metaforce.rc" @ONLY) + set(PLAT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/platforms/win/metaforce.rc" platforms/win/metaforce.manifest) if(WINDOWS_STORE) set(UWP_ASSETS platforms/win/Assets/LargeTile.scale-100.png @@ -39,11 +39,11 @@ if(WIN32) platforms/win/Assets/Square150x150Logo.scale-150.png platforms/win/Assets/Square150x150Logo.scale-200.png platforms/win/Assets/Square150x150Logo.scale-400.png - platforms/win/Assets/urde.scale-100.png - platforms/win/Assets/urde.scale-125.png - platforms/win/Assets/urde.scale-150.png - platforms/win/Assets/urde.scale-200.png - platforms/win/Assets/urde.scale-400.png + platforms/win/Assets/metaforce.scale-100.png + platforms/win/Assets/metaforce.scale-125.png + platforms/win/Assets/metaforce.scale-150.png + platforms/win/Assets/metaforce.scale-200.png + platforms/win/Assets/metaforce.scale-400.png platforms/win/Assets/WideTile.scale-100.png platforms/win/Assets/WideTile.scale-125.png platforms/win/Assets/WideTile.scale-150.png @@ -84,8 +84,8 @@ target_include_directories(metaforce PUBLIC ${CMAKE_BINARY_DIR}) target_link_libraries(metaforce - UrdeIcons - UrdeBadging + MetaforceIcons + MetaforceBadging RuntimeCommon amuse RetroDataSpec diff --git a/Editor/Camera.hpp b/Editor/Camera.hpp index 0a7b78468..9942cfb79 100644 --- a/Editor/Camera.hpp +++ b/Editor/Camera.hpp @@ -6,7 +6,7 @@ #include "zeus/CVector3f.hpp" #include "zeus/Math.hpp" -namespace urde { +namespace metaforce { class Camera { zeus::CFrustum m_frustum; zeus::CProjection m_projection; @@ -22,4 +22,4 @@ public: virtual void think() {} }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/GameMode.cpp b/Editor/GameMode.cpp index b216c4505..dfeda37cf 100644 --- a/Editor/GameMode.cpp +++ b/Editor/GameMode.cpp @@ -1,6 +1,6 @@ #include "GameMode.hpp" -namespace urde { +namespace metaforce { void GameMode::think() { ViewerSpace::think(); } void GameMode::View::draw(boo::IGraphicsCommandQueue* gfxQ) { @@ -8,4 +8,4 @@ void GameMode::View::draw(boo::IGraphicsCommandQueue* gfxQ) { m_gMode.m_main->Draw(); } -} // namespace urde +} // namespace metaforce diff --git a/Editor/GameMode.hpp b/Editor/GameMode.hpp index 545831ce7..b5ab29ddc 100644 --- a/Editor/GameMode.hpp +++ b/Editor/GameMode.hpp @@ -4,7 +4,7 @@ #include "ViewManager.hpp" #include "Runtime/IMain.hpp" -namespace urde { +namespace metaforce { class GameMode : public ViewerSpace { std::shared_ptr m_main; @@ -51,4 +51,4 @@ public: bool usesToolbar() const override { return m_state.showToolbar; } }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/InformationCenter.cpp b/Editor/InformationCenter.cpp index 1193a814a..3a2d69cfc 100644 --- a/Editor/InformationCenter.cpp +++ b/Editor/InformationCenter.cpp @@ -1,3 +1,3 @@ #include "InformationCenter.hpp" -namespace urde {} +namespace metaforce {} diff --git a/Editor/InformationCenter.hpp b/Editor/InformationCenter.hpp index a59767c5f..733d55fc0 100644 --- a/Editor/InformationCenter.hpp +++ b/Editor/InformationCenter.hpp @@ -3,7 +3,7 @@ #include "Space.hpp" #include "ViewManager.hpp" -namespace urde { +namespace metaforce { class InformationCenter : public ViewerSpace { struct State : Space::State { AT_DECL_DNA_YAMLV @@ -47,4 +47,4 @@ public: bool usesToolbar() const override { return true; } }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/ModelViewer.cpp b/Editor/ModelViewer.cpp index bb29fc736..41f83237d 100644 --- a/Editor/ModelViewer.cpp +++ b/Editor/ModelViewer.cpp @@ -1,10 +1,10 @@ #include "ModelViewer.hpp" -namespace urde { +namespace metaforce { void ModelViewer::View::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub) { specter::View::resized(root, sub); m_scissorRect = sub; } -} // namespace urde +} // namespace metaforce diff --git a/Editor/ModelViewer.hpp b/Editor/ModelViewer.hpp index 4d7c3a5be..fe993ebfa 100644 --- a/Editor/ModelViewer.hpp +++ b/Editor/ModelViewer.hpp @@ -4,7 +4,7 @@ #include "ViewManager.hpp" #include "Camera.hpp" -namespace urde { +namespace metaforce { class ModelViewer : public ViewerSpace { struct State : Space::State { AT_DECL_DNA_YAMLV @@ -17,7 +17,7 @@ class ModelViewer : public ViewerSpace { } m_state; const Space::State& spaceState() const override { return m_state; } - std::unique_ptr m_lineRenderer; + std::unique_ptr m_lineRenderer; struct View : specter::View { ModelViewer& m_mv; boo::SWindowRect m_scissorRect; @@ -33,7 +33,7 @@ class ModelViewer : public ViewerSpace { public: ModelViewer(ViewManager& vm, Space* parent) : ViewerSpace(vm, Class::ModelViewer, parent) { reloadState(); - m_lineRenderer.reset(new urde::CLineRenderer(urde::CLineRenderer::EPrimitiveMode::LineStrip, 4, nullptr, true)); + m_lineRenderer.reset(new metaforce::CLineRenderer(metaforce::CLineRenderer::EPrimitiveMode::LineStrip, 4, nullptr, true)); } ModelViewer(ViewManager& vm, Space* parent, const ModelViewer& other) : ModelViewer(vm, parent) { @@ -61,4 +61,4 @@ public: bool usesToolbar() const override { return true; } }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/ParticleEditor.cpp b/Editor/ParticleEditor.cpp index 06e8b04fe..5188d18e2 100644 --- a/Editor/ParticleEditor.cpp +++ b/Editor/ParticleEditor.cpp @@ -1,3 +1,3 @@ #include "ParticleEditor.hpp" -namespace urde {} +namespace metaforce {} diff --git a/Editor/ParticleEditor.hpp b/Editor/ParticleEditor.hpp index 0df827632..58280f8cb 100644 --- a/Editor/ParticleEditor.hpp +++ b/Editor/ParticleEditor.hpp @@ -2,7 +2,7 @@ #include "Space.hpp" -namespace urde { +namespace metaforce { class EffectEditor : public EditorSpace { struct State : Space::State { @@ -29,4 +29,4 @@ public: bool usesToolbar() const override { return true; } }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/ProjectManager.cpp b/Editor/ProjectManager.cpp index 9a65e2ada..c77e1b3cc 100644 --- a/Editor/ProjectManager.cpp +++ b/Editor/ProjectManager.cpp @@ -4,7 +4,7 @@ #include "hecl/Blender/Connection.hpp" #include "version.h" -namespace urde { +namespace metaforce { static logvisor::Module Log("URDE::ProjectManager"); ProjectManager* ProjectManager::g_SharedManager = nullptr; @@ -113,8 +113,8 @@ bool ProjectManager::openProject(hecl::SystemStringView path) { return true; }; - const hecl::ProjectPath urdeSpacesPath(*m_proj, _SYS_STR(".hecl/urde_spaces.yaml")); - athena::io::FileReader reader(urdeSpacesPath.getAbsolutePath()); + const hecl::ProjectPath metaforceSpacesPath(*m_proj, _SYS_STR(".hecl/metaforce_spaces.yaml")); + athena::io::FileReader reader(metaforceSpacesPath.getAbsolutePath()); if (!reader.isOpen()) { return makeProj(true); @@ -126,7 +126,7 @@ bool ProjectManager::openProject(hecl::SystemStringView path) { }; yaml_parser_set_input(r.getParser(), readHandler, &reader); - if (!r.ValidateClassType("UrdeSpacesState")) { + if (!r.ValidateClassType("MetaforceSpacesState")) { return makeProj(true); } @@ -145,7 +145,7 @@ bool ProjectManager::saveProject() { if (!m_proj) return false; - hecl::ProjectPath oldSpacesPath(*m_proj, _SYS_STR(".hecl/~urde_spaces.yaml")); + hecl::ProjectPath oldSpacesPath(*m_proj, _SYS_STR(".hecl/~metaforce_spaces.yaml")); athena::io::FileWriter writer(oldSpacesPath.getAbsolutePath()); if (!writer.isOpen()) return false; @@ -155,7 +155,7 @@ bool ProjectManager::saveProject() { if (!w.finish(&writer)) return false; - hecl::ProjectPath newSpacesPath(*m_proj, _SYS_STR(".hecl/urde_spaces.yaml")); + hecl::ProjectPath newSpacesPath(*m_proj, _SYS_STR(".hecl/metaforce_spaces.yaml")); hecl::Unlink(newSpacesPath.getAbsolutePath().data()); hecl::Rename(oldSpacesPath.getAbsolutePath().data(), newSpacesPath.getAbsolutePath().data()); @@ -197,4 +197,4 @@ void ProjectManager::shutdown() { hecl::blender::Connection::Shutdown(); } -} // namespace urde +} // namespace metaforce diff --git a/Editor/ProjectManager.hpp b/Editor/ProjectManager.hpp index 2b092ba07..458b3ad71 100644 --- a/Editor/ProjectManager.hpp +++ b/Editor/ProjectManager.hpp @@ -7,7 +7,7 @@ #include "hecl/Runtime.hpp" #include "MP1/MP1.hpp" -namespace urde { +namespace metaforce { class ViewManager; using ConfigReader = athena::io::YAMLDocReader; @@ -55,4 +55,4 @@ public: void shutdown(); }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/ProjectResourceFactoryBase.cpp b/Editor/ProjectResourceFactoryBase.cpp index 5bf32e6ea..0b10f40e9 100644 --- a/Editor/ProjectResourceFactoryBase.cpp +++ b/Editor/ProjectResourceFactoryBase.cpp @@ -7,8 +7,8 @@ #undef min #undef max -namespace urde { -static logvisor::Module Log("urde::ProjectResourceFactoryBase"); +namespace metaforce { +static logvisor::Module Log("metaforce::ProjectResourceFactoryBase"); void ProjectResourceFactoryBase::BeginBackgroundIndex(hecl::Database::Project& proj, const hecl::Database::DataSpecEntry& origSpec, @@ -47,7 +47,7 @@ CFactoryFnReturn ProjectResourceFactoryBase::BuildSync(const SObjectTag& tag, co return ret; } -void ProjectResourceFactoryBase::AsyncTask::EnsurePath(const urde::SObjectTag& tag, const hecl::ProjectPath& path) { +void ProjectResourceFactoryBase::AsyncTask::EnsurePath(const metaforce::SObjectTag& tag, const hecl::ProjectPath& path) { if (!m_workingPath) { m_workingPath = path; @@ -64,7 +64,7 @@ void ProjectResourceFactoryBase::AsyncTask::EnsurePath(const urde::SObjectTag& t m_cookedPath = path.getCookedPath(*m_parent.m_origSpec); if (!m_cookedPath.isFile() || m_cookedPath.getModtime() < path.getModtime()) { /* Last chance type validation */ - urde::SObjectTag verifyTag = m_parent.TagFromPath(path); + metaforce::SObjectTag verifyTag = m_parent.TagFromPath(path); if (verifyTag.type != tag.type) { Log.report(logvisor::Error, FMT_STRING(_SYS_STR("{}: expected type '{}', found '{}'")), path.getRelativePath(), tag.type, verifyTag.type); @@ -181,7 +181,7 @@ bool ProjectResourceFactoryBase::PrepForReadSync(const SObjectTag& tag, const he cooked = path.getCookedPath(*m_origSpec); if (!cooked.isFile() || cooked.getModtime() < path.getModtime()) { /* Last chance type validation */ - urde::SObjectTag verifyTag = TagFromPath(path); + metaforce::SObjectTag verifyTag = TagFromPath(path); if (verifyTag.type != tag.type) { Log.report(logvisor::Error, FMT_STRING(_SYS_STR("{}: expected type '{}', found '{}'")), path.getRelativePath(), tag.type, verifyTag.type); @@ -211,8 +211,8 @@ bool ProjectResourceFactoryBase::PrepForReadSync(const SObjectTag& tag, const he return true; } -std::unique_ptr ProjectResourceFactoryBase::Build(const urde::SObjectTag& tag, - const urde::CVParamTransfer& paramXfer, +std::unique_ptr ProjectResourceFactoryBase::Build(const metaforce::SObjectTag& tag, + const metaforce::CVParamTransfer& paramXfer, CObjectReference* selfRef) { if (!tag.id.IsValid()) Log.report(logvisor::Fatal, FMT_STRING("attempted to access null id on type '{}'"), tag.type); @@ -261,17 +261,17 @@ std::unique_ptr ProjectResourceFactoryBase::Build(const urde::SObjec return BuildSync(tag, *resPath, paramXfer, selfRef); } -std::shared_ptr ProjectResourceFactoryBase::BuildAsyncInternal(const urde::SObjectTag& tag, - const urde::CVParamTransfer& paramXfer, - std::unique_ptr* objOut, +std::shared_ptr ProjectResourceFactoryBase::BuildAsyncInternal(const metaforce::SObjectTag& tag, + const metaforce::CVParamTransfer& paramXfer, + std::unique_ptr* objOut, CObjectReference* selfRef) { if (m_asyncLoadMap.find(tag) != m_asyncLoadMap.end()) return {}; return _AddTask(std::make_unique(*this, tag, objOut, paramXfer, selfRef)); } -void ProjectResourceFactoryBase::BuildAsync(const urde::SObjectTag& tag, const urde::CVParamTransfer& paramXfer, - std::unique_ptr* objOut, CObjectReference* selfRef) { +void ProjectResourceFactoryBase::BuildAsync(const metaforce::SObjectTag& tag, const metaforce::CVParamTransfer& paramXfer, + std::unique_ptr* objOut, CObjectReference* selfRef) { if (!tag.id.IsValid()) Log.report(logvisor::Fatal, FMT_STRING("attempted to access null id on type '{}'"), tag.type); @@ -295,27 +295,27 @@ u32 ProjectResourceFactoryBase::ResourceSize(const SObjectTag& tag) { return fr->length(); } -std::shared_ptr ProjectResourceFactoryBase::LoadResourceAsync(const urde::SObjectTag& tag, +std::shared_ptr ProjectResourceFactoryBase::LoadResourceAsync(const metaforce::SObjectTag& tag, void* target) { if (!tag.id.IsValid()) Log.report(logvisor::Fatal, FMT_STRING("attempted to access null id")); if (m_asyncLoadMap.find(tag) != m_asyncLoadMap.end()) return {}; - return std::static_pointer_cast( + return std::static_pointer_cast( _AddTask(std::make_shared(*this, tag, reinterpret_cast(target)))); } -std::shared_ptr ProjectResourceFactoryBase::LoadResourcePartAsync(const urde::SObjectTag& tag, +std::shared_ptr ProjectResourceFactoryBase::LoadResourcePartAsync(const metaforce::SObjectTag& tag, u32 off, u32 size, void* target) { if (!tag.id.IsValid()) Log.report(logvisor::Fatal, FMT_STRING("attempted to access null id")); if (m_asyncLoadMap.find(tag) != m_asyncLoadMap.end()) return {}; - return std::static_pointer_cast( + return std::static_pointer_cast( _AddTask(std::make_shared(*this, tag, reinterpret_cast(target), size, off))); } -std::unique_ptr ProjectResourceFactoryBase::LoadResourceSync(const urde::SObjectTag& tag) { +std::unique_ptr ProjectResourceFactoryBase::LoadResourceSync(const metaforce::SObjectTag& tag) { if (!tag.id.IsValid()) Log.report(logvisor::Fatal, FMT_STRING("attempted to access null id")); @@ -332,7 +332,7 @@ std::unique_ptr ProjectResourceFactoryBase::LoadResourceSync(const urde::S return fr->readUBytes(fr->length()); } -std::unique_ptr ProjectResourceFactoryBase::LoadNewResourcePartSync(const urde::SObjectTag& tag, u32 off, +std::unique_ptr ProjectResourceFactoryBase::LoadNewResourcePartSync(const metaforce::SObjectTag& tag, u32 off, u32 size) { if (!tag.id.IsValid()) Log.report(logvisor::Fatal, FMT_STRING("attempted to access null id")); @@ -352,7 +352,7 @@ std::unique_ptr ProjectResourceFactoryBase::LoadNewResourcePartSync(const return fr->readUBytes(sz); } -std::shared_ptr ProjectResourceFactoryBase::CookResourceAsync(const urde::SObjectTag& tag) { +std::shared_ptr ProjectResourceFactoryBase::CookResourceAsync(const metaforce::SObjectTag& tag) { if (!tag.id.IsValid()) Log.report(logvisor::Fatal, FMT_STRING("attempted to access null id")); if (m_asyncLoadMap.find(tag) != m_asyncLoadMap.end()) @@ -360,9 +360,9 @@ std::shared_ptr ProjectResourceFactoryBase::CookResourceAsync(const u return _AddTask(std::make_shared(*this, tag)); } -void ProjectResourceFactoryBase::CancelBuild(const urde::SObjectTag& tag) { _RemoveTask(tag); } +void ProjectResourceFactoryBase::CancelBuild(const metaforce::SObjectTag& tag) { _RemoveTask(tag); } -bool ProjectResourceFactoryBase::CanBuild(const urde::SObjectTag& tag) { +bool ProjectResourceFactoryBase::CanBuild(const metaforce::SObjectTag& tag) { if (!tag.id.IsValid()) Log.report(logvisor::Fatal, FMT_STRING("attempted to access null id")); @@ -376,7 +376,7 @@ bool ProjectResourceFactoryBase::CanBuild(const urde::SObjectTag& tag) { return false; } -const urde::SObjectTag* ProjectResourceFactoryBase::GetResourceIdByName(std::string_view name) const { +const metaforce::SObjectTag* ProjectResourceFactoryBase::GetResourceIdByName(std::string_view name) const { return static_cast(*m_cookSpec).getResourceIdByName(name); } @@ -464,4 +464,4 @@ void ProjectResourceFactoryBase::AsyncIdle() { } } -} // namespace urde +} // namespace metaforce diff --git a/Editor/ProjectResourceFactoryBase.hpp b/Editor/ProjectResourceFactoryBase.hpp index 7ed682067..208e3a8bb 100644 --- a/Editor/ProjectResourceFactoryBase.hpp +++ b/Editor/ProjectResourceFactoryBase.hpp @@ -16,14 +16,14 @@ #include #include -namespace urde { +namespace metaforce { class ProjectResourceFactoryBase : public IFactory { friend class ProjectResourcePool; hecl::ClientProcess& m_clientProc; public: - struct AsyncTask : urde::IDvdRequest { + struct AsyncTask : metaforce::IDvdRequest { ProjectResourceFactoryBase& m_parent; SObjectTag x0_tag; @@ -63,7 +63,7 @@ public: /* Cook only */ AsyncTask(ProjectResourceFactoryBase& parent, const SObjectTag& tag) : m_parent(parent), x0_tag(tag) {} - void EnsurePath(const urde::SObjectTag& tag, const hecl::ProjectPath& path); + void EnsurePath(const metaforce::SObjectTag& tag, const hecl::ProjectPath& path); void CookComplete(); bool AsyncPump(); void WaitUntilComplete() override; @@ -78,7 +78,7 @@ protected: const hecl::Database::DataSpecEntry* m_pcSpec = nullptr; /* Used to resolve cooked paths */ std::unique_ptr m_cookSpec; - urde::CFactoryMgr m_factoryMgr; + metaforce::CFactoryMgr m_factoryMgr; std::list> m_asyncLoadList; std::unordered_map>::iterator> m_asyncLoadMap; @@ -98,7 +98,7 @@ protected: bool PrepForReadSync(const SObjectTag& tag, const hecl::ProjectPath& path, std::optional& fr); - bool WaitForTagReady(const urde::SObjectTag& tag, const hecl::ProjectPath*& pathOut) { + bool WaitForTagReady(const metaforce::SObjectTag& tag, const hecl::ProjectPath*& pathOut) { return static_cast(*m_cookSpec).waitForTagReady(tag, pathOut); } SObjectTag TagFromPath(const hecl::ProjectPath& path) const { @@ -120,18 +120,18 @@ protected: bool SyncCook(const hecl::ProjectPath& working); CFactoryFnReturn BuildSync(const SObjectTag& tag, const hecl::ProjectPath& path, const CVParamTransfer& paramXfer, CObjectReference* selfRef); - std::shared_ptr BuildAsyncInternal(const urde::SObjectTag&, const urde::CVParamTransfer&, - std::unique_ptr*, CObjectReference* selfRef); + std::shared_ptr BuildAsyncInternal(const metaforce::SObjectTag&, const metaforce::CVParamTransfer&, + std::unique_ptr*, CObjectReference* selfRef); public: ProjectResourceFactoryBase(hecl::ClientProcess& clientProc) : m_clientProc(clientProc) {} - std::unique_ptr Build(const urde::SObjectTag&, const urde::CVParamTransfer&, + std::unique_ptr Build(const metaforce::SObjectTag&, const metaforce::CVParamTransfer&, CObjectReference* selfRef) override; - void BuildAsync(const urde::SObjectTag&, const urde::CVParamTransfer&, std::unique_ptr*, + void BuildAsync(const metaforce::SObjectTag&, const metaforce::CVParamTransfer&, std::unique_ptr*, CObjectReference* selfRef) override; - void CancelBuild(const urde::SObjectTag&) override; - bool CanBuild(const urde::SObjectTag&) override; - const urde::SObjectTag* GetResourceIdByName(std::string_view) const override; + void CancelBuild(const metaforce::SObjectTag&) override; + bool CanBuild(const metaforce::SObjectTag&) override; + const metaforce::SObjectTag* GetResourceIdByName(std::string_view) const override; FourCC GetResourceTypeById(CAssetId id) const override; hecl::ProjectPath GetCookedPath(const hecl::ProjectPath& working, bool pcTarget) const { return static_cast(*m_cookSpec).getCookedPath(working, pcTarget); @@ -141,13 +141,13 @@ public: void EnumerateNamedResources(const std::function& lambda) const override; u32 ResourceSize(const SObjectTag& tag) override; - std::shared_ptr LoadResourceAsync(const urde::SObjectTag& tag, void* target) override; - std::shared_ptr LoadResourcePartAsync(const urde::SObjectTag& tag, u32 off, u32 size, + std::shared_ptr LoadResourceAsync(const metaforce::SObjectTag& tag, void* target) override; + std::shared_ptr LoadResourcePartAsync(const metaforce::SObjectTag& tag, u32 off, u32 size, void* target) override; - std::unique_ptr LoadResourceSync(const urde::SObjectTag& tag) override; - std::unique_ptr LoadNewResourcePartSync(const urde::SObjectTag& tag, u32 off, u32 size) override; + std::unique_ptr LoadResourceSync(const metaforce::SObjectTag& tag) override; + std::unique_ptr LoadNewResourcePartSync(const metaforce::SObjectTag& tag, u32 off, u32 size) override; - std::shared_ptr CookResourceAsync(const urde::SObjectTag& tag); + std::shared_ptr CookResourceAsync(const metaforce::SObjectTag& tag); template bool AsyncPumpTask(ItType& it); @@ -160,4 +160,4 @@ public: ~ProjectResourceFactoryBase() override { Shutdown(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/ProjectResourceFactoryMP1.cpp b/Editor/ProjectResourceFactoryMP1.cpp index 9b9d0a90a..e940a1345 100644 --- a/Editor/ProjectResourceFactoryMP1.cpp +++ b/Editor/ProjectResourceFactoryMP1.cpp @@ -43,7 +43,7 @@ extern hecl::Database::DataSpecEntry SpecEntMP1; extern hecl::Database::DataSpecEntry SpecEntMP1PC; } // namespace DataSpec -namespace urde { +namespace metaforce { ProjectResourceFactoryMP1::ProjectResourceFactoryMP1(hecl::ClientProcess& clientProc) : ProjectResourceFactoryBase(clientProc) { @@ -81,4 +81,4 @@ void ProjectResourceFactoryMP1::IndexMP1Resources(hecl::Database::Project& proj, BeginBackgroundIndex(proj, DataSpec::SpecEntMP1, DataSpec::SpecEntMP1PC); } -} // namespace urde +} // namespace metaforce diff --git a/Editor/ProjectResourceFactoryMP1.hpp b/Editor/ProjectResourceFactoryMP1.hpp index 8839ba0fb..be57121d3 100644 --- a/Editor/ProjectResourceFactoryMP1.hpp +++ b/Editor/ProjectResourceFactoryMP1.hpp @@ -3,7 +3,7 @@ #include "Editor/ProjectResourceFactoryBase.hpp" #include "Runtime/CToken.hpp" -namespace urde { +namespace metaforce { class MP1OriginalIDs; class CSimplePool; @@ -13,4 +13,4 @@ public: void IndexMP1Resources(hecl::Database::Project& proj, CSimplePool& sp); }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/Resource.cpp b/Editor/Resource.cpp index 22c0318b6..e02d8ff7d 100644 --- a/Editor/Resource.cpp +++ b/Editor/Resource.cpp @@ -1,6 +1,6 @@ #include "Resource.hpp" -namespace urde { +namespace metaforce { Space::Class Resource::DeduceDefaultSpaceClass(const hecl::ProjectPath& path) { athena::io::FileReader r(path.getAbsolutePath(), 32 * 1024, false); @@ -9,4 +9,4 @@ Space::Class Resource::DeduceDefaultSpaceClass(const hecl::ProjectPath& path) { return Space::Class::None; } -} // namespace urde +} // namespace metaforce diff --git a/Editor/Resource.hpp b/Editor/Resource.hpp index 62ab31e45..5385e19b8 100644 --- a/Editor/Resource.hpp +++ b/Editor/Resource.hpp @@ -3,7 +3,7 @@ #include "hecl/Database.hpp" #include "Space.hpp" -namespace urde { +namespace metaforce { /** Combines a ProjectPath with actively used Space references * @@ -43,4 +43,4 @@ private: std::unique_ptr m_rootNode; }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/ResourceBrowser.cpp b/Editor/ResourceBrowser.cpp index 247d0ab7e..5ce3f99e2 100644 --- a/Editor/ResourceBrowser.cpp +++ b/Editor/ResourceBrowser.cpp @@ -1,6 +1,6 @@ #include "ResourceBrowser.hpp" -namespace urde { +namespace metaforce { #define BROWSER_MARGIN 8 bool ResourceBrowser::navigateToPath(const hecl::ProjectPath& pathIn) { @@ -67,4 +67,4 @@ void ResourceBrowser::View::resized(const boo::SWindowRect& root, const boo::SWi } void ResourceBrowser::View::draw(boo::IGraphicsCommandQueue* gfxQ) { m_resListing.m_view->draw(gfxQ); } -} // namespace urde +} // namespace metaforce diff --git a/Editor/ResourceBrowser.hpp b/Editor/ResourceBrowser.hpp index d405a9d77..bb3f24fee 100644 --- a/Editor/ResourceBrowser.hpp +++ b/Editor/ResourceBrowser.hpp @@ -5,7 +5,7 @@ #include "specter/PathButtons.hpp" #include "specter/Table.hpp" -namespace urde { +namespace metaforce { class ResourceBrowser : public Space, public specter::IPathButtonsBinding { struct State : Space::State { @@ -202,4 +202,4 @@ public: unsigned toolbarUnits() const override { return 2; } }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/Space.cpp b/Editor/Space.cpp index 1f1b02a42..213da9762 100644 --- a/Editor/Space.cpp +++ b/Editor/Space.cpp @@ -8,7 +8,7 @@ #include "icons/icons.hpp" #include "specter/Menu.hpp" -namespace urde { +namespace metaforce { static logvisor::Module Log("URDE::Space"); Space::Space(ViewManager& vm, Class cls, Space* parent) @@ -259,4 +259,4 @@ void Space::SpaceMenuNode::SubNode::activated(const boo::SWindowCoord& coord) { } } -} // namespace urde +} // namespace metaforce diff --git a/Editor/Space.hpp b/Editor/Space.hpp index a0ae82b0f..659482d51 100644 --- a/Editor/Space.hpp +++ b/Editor/Space.hpp @@ -16,7 +16,7 @@ class ViewResources; class Toolbar; struct Icon; } // namespace specter -namespace urde { +namespace metaforce { class ViewManager; class RootSpace; class SplitSpace; @@ -374,4 +374,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/SplashScreen.cpp b/Editor/SplashScreen.cpp index 6af19683e..cd4345a36 100644 --- a/Editor/SplashScreen.cpp +++ b/Editor/SplashScreen.cpp @@ -2,7 +2,7 @@ #include "version.h" #include "badging/Badging.hpp" -namespace urde { +namespace metaforce { #define SPLASH_WIDTH 555 #define SPLASH_HEIGHT 300 @@ -268,4 +268,4 @@ void SplashScreen::draw(boo::IGraphicsCommandQueue* gfxQ) { m_fileBrowser.m_view->draw(gfxQ); } -} // namespace urde +} // namespace metaforce diff --git a/Editor/SplashScreen.hpp b/Editor/SplashScreen.hpp index dcad65705..69035656c 100644 --- a/Editor/SplashScreen.hpp +++ b/Editor/SplashScreen.hpp @@ -9,7 +9,7 @@ #include "ViewManager.hpp" -namespace urde { +namespace metaforce { static logvisor::Module Log("specter::SplashScreen"); class SplashScreen : public specter::ModalWindow { @@ -161,4 +161,4 @@ public: void draw(boo::IGraphicsCommandQueue* gfxQ) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/ViewManager.cpp b/Editor/ViewManager.cpp index 5488ed55c..c8d0b782a 100644 --- a/Editor/ViewManager.cpp +++ b/Editor/ViewManager.cpp @@ -23,7 +23,7 @@ using YAMLNode = athena::io::YAMLNode; extern hecl::SystemString ExeDir; -namespace urde { +namespace metaforce { void ViewManager::InitMP1(MP1::CMain& main) { main.Init(m_fileStoreManager, &m_cvarManager, m_mainWindow.get(), m_voiceEngine.get(), *m_amuseAllocWrapper); @@ -39,7 +39,7 @@ void ViewManager::InitMP1(MP1::CMain& main) { void ViewManager::TestGameView::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub) { specter::View::resized(root, sub); - urde::CGraphics::SetViewportResolution({sub.size[0], sub.size[1]}); + metaforce::CGraphics::SetViewportResolution({sub.size[0], sub.size[1]}); if (m_debugText) { boo::SWindowRect newSub = sub; newSub.location[1] = 5 * m_vm.m_viewResources.pixelFactor(); @@ -68,7 +68,7 @@ void ViewManager::TestGameView::think() { overlayText += fmt::format(FMT_STRING("Frame: {}\n"), g_StateManager->GetUpdateFrameIndex()); if (m_vm.m_cvarCommons.m_debugOverlayShowFramerate->toBoolean()) - overlayText += fmt::format(FMT_STRING("FPS: {}\n"), urde::CGraphics::GetFPS()); + overlayText += fmt::format(FMT_STRING("FPS: {}\n"), metaforce::CGraphics::GetFPS()); if (m_vm.m_cvarCommons.m_debugOverlayShowInGameTime->toBoolean()) { double igt = g_GameState->GetTotalPlayTime(); @@ -113,12 +113,12 @@ void ViewManager::TestGameView::think() { if (m_vm.m_cvarCommons.m_debugOverlayWorldInfo->toBoolean()) { TLockedToken tbl = g_SimplePool->GetObj({FOURCC('STRG'), g_StateManager->GetWorld()->IGetStringTableAssetId()}); - const urde::TAreaId aId = g_GameState->CurrentWorldState().GetCurrentAreaId(); + const metaforce::TAreaId aId = g_GameState->CurrentWorldState().GetCurrentAreaId(); overlayText += fmt::format(FMT_STRING("World: 0x{}{}, Area: {}\n"), g_GameState->CurrentWorldAssetId(), (tbl.IsLoaded() ? (" " + hecl::Char16ToUTF8(tbl->GetString(0))).c_str() : ""), aId); } - const urde::TAreaId aId = g_GameState->CurrentWorldState().GetCurrentAreaId(); + const metaforce::TAreaId aId = g_GameState->CurrentWorldState().GetCurrentAreaId(); if (m_vm.m_cvarCommons.m_debugOverlayAreaInfo->toBoolean() && g_StateManager->GetWorld() && g_StateManager->GetWorld()->DoesAreaExist(aId)) { const auto& layerStates = g_GameState->CurrentWorldState().GetLayerState(); @@ -139,7 +139,7 @@ void ViewManager::TestGameView::think() { } if (m_vm.m_cvarCommons.m_debugOverlayShowRandomStats->toBoolean()) { - overlayText += fmt::format(FMT_STRING("CRandom16::Next calls: {}\n"), urde::CRandom16::GetNumNextCalls()); + overlayText += fmt::format(FMT_STRING("CRandom16::Next calls: {}\n"), metaforce::CRandom16::GetNumNextCalls()); } if (m_vm.m_cvarCommons.m_debugOverlayShowResourceStats->toBoolean()) @@ -420,4 +420,4 @@ void ViewManager::stop() { m_fontCache.destroyAtlases(); } -} // namespace urde +} // namespace metaforce diff --git a/Editor/ViewManager.hpp b/Editor/ViewManager.hpp index 67cb577c6..9533bb797 100644 --- a/Editor/ViewManager.hpp +++ b/Editor/ViewManager.hpp @@ -26,7 +26,7 @@ namespace hecl { class PipelineConverterBase; } -namespace urde { +namespace metaforce { class SplashScreen; class ViewManager final : public specter::IViewManager { @@ -196,4 +196,4 @@ public: void deferOpenProject(const hecl::SystemString& path) { m_deferedProject = path; } }; -} // namespace urde +} // namespace metaforce diff --git a/Editor/badging/Badging.cpp b/Editor/badging/Badging.cpp index 45215a55a..8f4719626 100644 --- a/Editor/badging/Badging.cpp +++ b/Editor/badging/Badging.cpp @@ -7,7 +7,7 @@ extern "C" uint8_t URDE_BADGE[]; extern "C" size_t URDE_BADGE_SZ; -namespace urde { +namespace metaforce { static logvisor::Module Log("URDE::badging"); static specter::Icon g_BadgeIcon; @@ -42,4 +42,4 @@ void DestroyBadging() { g_BadgeIcon.m_tex.reset(); } specter::Icon& GetBadge() { return g_BadgeIcon; } -} // namespace urde +} // namespace metaforce diff --git a/Editor/badging/Badging.hpp b/Editor/badging/Badging.hpp index f7dd6b7e4..ff0b5d42a 100644 --- a/Editor/badging/Badging.hpp +++ b/Editor/badging/Badging.hpp @@ -2,12 +2,12 @@ #include "specter/ViewResources.hpp" -namespace urde { +namespace metaforce { void InitializeBadging(specter::ViewResources& viewRes); void DestroyBadging(); specter::Icon& GetBadge(); -} // namespace urde +} // namespace metaforce #ifndef BADGE_PHRASE #define BADGE_PHRASE "Prototype" diff --git a/Editor/badging/CMakeLists.txt b/Editor/badging/CMakeLists.txt index ec1e50d13..6657f5760 100644 --- a/Editor/badging/CMakeLists.txt +++ b/Editor/badging/CMakeLists.txt @@ -13,22 +13,22 @@ target_include_directories(packbadge PRIVATE ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_D ################## # Add all targets to the build-tree export set -export(TARGETS packbadge FILE "${CMAKE_CURRENT_BINARY_DIR}/urde-packbadgeTargets.cmake") +export(TARGETS packbadge FILE "${CMAKE_CURRENT_BINARY_DIR}/metaforce-packbadgeTargets.cmake") # Export the package for use from the build-tree # (this registers the build-tree with a global CMake-registry) -export(PACKAGE urde-packbadge) +export(PACKAGE metaforce-packbadge) # Create the atdnaConfig.cmake # ... for the build tree -configure_file(urde-packbadgeConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/urde-packbadgeConfig.cmake" @ONLY) +configure_file(metaforce-packbadgeConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/metaforce-packbadgeConfig.cmake" @ONLY) # ... for the install tree -configure_file(urde-packbadgeConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/urde-packbadgeConfig.cmake" @ONLY) +configure_file(metaforce-packbadgeConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/metaforce-packbadgeConfig.cmake" @ONLY) # ... for both -configure_file(urde-packbadgeConfigVersion.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/urde-packbadgeConfigVersion.cmake" @ONLY) +configure_file(metaforce-packbadgeConfigVersion.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/metaforce-packbadgeConfigVersion.cmake" @ONLY) else() -find_package(urde-packbadge REQUIRED) +find_package(metaforce-packbadge REQUIRED) endif() add_custom_command(OUTPUT badge.bin COMMAND $ @@ -37,7 +37,7 @@ add_custom_command(OUTPUT badge.bin COMMAND $ MAIN_DEPENDENCY badge.png COMMENT "Generating badge.bin") bintoc(badge.cpp ${CMAKE_CURRENT_BINARY_DIR}/badge.bin URDE_BADGE) -add_library(UrdeBadging +add_library(MetaforceBadging badge.cpp badge.bin Badging.hpp Badging.cpp) -target_link_libraries(UrdeBadging PUBLIC specter) +target_link_libraries(MetaforceBadging PUBLIC specter) diff --git a/Editor/badging/urde-packbadgeConfig.cmake.in b/Editor/badging/metaforce-packbadgeConfig.cmake.in similarity index 79% rename from Editor/badging/urde-packbadgeConfig.cmake.in rename to Editor/badging/metaforce-packbadgeConfig.cmake.in index 47f3b47ca..cb77a1e60 100644 --- a/Editor/badging/urde-packbadgeConfig.cmake.in +++ b/Editor/badging/metaforce-packbadgeConfig.cmake.in @@ -5,5 +5,5 @@ get_filename_component(PACKBADGE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) # Our library dependencies (contains definitions for IMPORTED targets) if(NOT TARGET packbadge AND NOT packbadge_BINARY_DIR) - include("${PACKBADGE_CMAKE_DIR}/urde-packbadgeTargets.cmake") + include("${PACKBADGE_CMAKE_DIR}/metaforce-packbadgeTargets.cmake") endif() diff --git a/Editor/badging/urde-packbadgeConfigVersion.cmake.in b/Editor/badging/metaforce-packbadgeConfigVersion.cmake.in similarity index 100% rename from Editor/badging/urde-packbadgeConfigVersion.cmake.in rename to Editor/badging/metaforce-packbadgeConfigVersion.cmake.in diff --git a/Editor/icons/CMakeLists.txt b/Editor/icons/CMakeLists.txt index ea25fcdab..7a0129129 100644 --- a/Editor/icons/CMakeLists.txt +++ b/Editor/icons/CMakeLists.txt @@ -12,22 +12,22 @@ target_include_directories(packicons PRIVATE ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_D ################## # Add all targets to the build-tree export set -export(TARGETS packicons FILE "${CMAKE_CURRENT_BINARY_DIR}/urde-packiconsTargets.cmake") +export(TARGETS packicons FILE "${CMAKE_CURRENT_BINARY_DIR}/metaforce-packiconsTargets.cmake") # Export the package for use from the build-tree # (this registers the build-tree with a global CMake-registry) -export(PACKAGE urde-packicons) +export(PACKAGE metaforce-packicons) # Create the atdnaConfig.cmake # ... for the build tree -configure_file(urde-packiconsConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/urde-packiconsConfig.cmake" @ONLY) +configure_file(metaforce-packiconsConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/metaforce-packiconsConfig.cmake" @ONLY) # ... for the install tree -configure_file(urde-packiconsConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/urde-packiconsConfig.cmake" @ONLY) +configure_file(metaforce-packiconsConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/metaforce-packiconsConfig.cmake" @ONLY) # ... for both -configure_file(urde-packiconsConfigVersion.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/urde-packiconsConfigVersion.cmake" @ONLY) +configure_file(metaforce-packiconsConfigVersion.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/metaforce-packiconsConfigVersion.cmake" @ONLY) else() -find_package(urde-packicons REQUIRED) +find_package(metaforce-packicons REQUIRED) endif() unset(INKSCAPE_BIN CACHE) @@ -59,5 +59,5 @@ else() endif() bintoc(icons_dat.cpp ${CMAKE_CURRENT_BINARY_DIR}/icons.bin URDE_ICONS) -add_library(UrdeIcons icons.cpp icons.hpp icons.bin icons_dat.cpp) -target_link_libraries(UrdeIcons PUBLIC specter) +add_library(MetaforceIcons icons.cpp icons.hpp icons.bin icons_dat.cpp) +target_link_libraries(MetaforceIcons PUBLIC specter) diff --git a/Editor/icons/icons.cpp b/Editor/icons/icons.cpp index 4701c20b5..e06fc6e6b 100644 --- a/Editor/icons/icons.cpp +++ b/Editor/icons/icons.cpp @@ -5,7 +5,7 @@ extern "C" uint8_t URDE_ICONS[]; extern "C" size_t URDE_ICONS_SZ; -namespace urde { +namespace metaforce { static logvisor::Module Log("URDE::icons"); specter::IconAtlas<8, 8> g_IconAtlas; @@ -91,4 +91,4 @@ specter::Icon& GetIcon(MonoIcon icon) { } } -} // namespace urde +} // namespace metaforce diff --git a/Editor/icons/icons.hpp b/Editor/icons/icons.hpp index f2ebd1a3b..b222a65af 100644 --- a/Editor/icons/icons.hpp +++ b/Editor/icons/icons.hpp @@ -3,7 +3,7 @@ #include "specter/Icon.hpp" #include "specter/ViewResources.hpp" -namespace urde { +namespace metaforce { void InitializeIcons(specter::ViewResources& viewRes); void DestroyIcons(); @@ -30,4 +30,4 @@ enum class MonoIcon { }; specter::Icon& GetIcon(MonoIcon icon); -} // namespace urde +} // namespace metaforce diff --git a/Editor/icons/urde-packiconsConfig.cmake.in b/Editor/icons/metaforce-packiconsConfig.cmake.in similarity index 79% rename from Editor/icons/urde-packiconsConfig.cmake.in rename to Editor/icons/metaforce-packiconsConfig.cmake.in index 1d3c7028e..89f7681e6 100644 --- a/Editor/icons/urde-packiconsConfig.cmake.in +++ b/Editor/icons/metaforce-packiconsConfig.cmake.in @@ -5,5 +5,5 @@ get_filename_component(PACKICONS_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) # Our library dependencies (contains definitions for IMPORTED targets) if(NOT TARGET packicons AND NOT packicons_BINARY_DIR) - include("${PACKICONS_CMAKE_DIR}/urde-packiconsTargets.cmake") + include("${PACKICONS_CMAKE_DIR}/metaforce-packiconsTargets.cmake") endif() diff --git a/Editor/icons/urde-packiconsConfigVersion.cmake.in b/Editor/icons/metaforce-packiconsConfigVersion.cmake.in similarity index 100% rename from Editor/icons/urde-packiconsConfigVersion.cmake.in rename to Editor/icons/metaforce-packiconsConfigVersion.cmake.in diff --git a/Editor/main.cpp b/Editor/main.cpp index baa65accd..ec2f17724 100644 --- a/Editor/main.cpp +++ b/Editor/main.cpp @@ -16,7 +16,7 @@ static void AthenaExc(athena::error::Level level, const char* file, const char*, AthenaLog.vreport(logvisor::Level(level), fmt, args); } -namespace urde { +namespace metaforce { static logvisor::Module Log{"Metaforce"}; static hecl::SystemString CPUFeatureString(const zeus::CPUInfo& cpuInf) { @@ -119,7 +119,7 @@ struct Application : boo::IApplicationCallback { int64_t getTargetFrameTime() { return m_cvarCommons.getVariableFrameTime() ? 0 : 1000000000L / 60; } }; -} // namespace urde +} // namespace metaforce static hecl::SystemChar CwdBuf[1024]; hecl::SystemString ExeDir; @@ -129,11 +129,11 @@ static void SetupBasics(bool logging) { if (!result.first) { #if _WIN32 && !WINDOWS_STORE std::wstring msg = fmt::format(FMT_STRING(L"ERROR: This build of Metaforce requires the following CPU features:\n{}\n"), - urde::CPUFeatureString(result.second)); + metaforce::CPUFeatureString(result.second)); MessageBoxW(nullptr, msg.c_str(), L"CPU error", MB_OK | MB_ICONERROR); #else fmt::print(stderr, FMT_STRING("ERROR: This build of Metaforce requires the following CPU features:\n{}\n"), - urde::CPUFeatureString(result.second)); + metaforce::CPUFeatureString(result.second)); #endif exit(1); } @@ -202,7 +202,7 @@ int main(int argc, const boo::SystemChar** argv) /* Handle -j argument */ hecl::SetCpuCountOverride(argc, argv); - urde::Application appCb(fileMgr, cvarMgr, cvarCmns); + metaforce::Application appCb(fileMgr, cvarMgr, cvarCmns); int ret = boo::ApplicationRun(boo::IApplication::EPlatformType::Auto, appCb, _SYS_STR("metaforce"), _SYS_STR("Metaforce"), argc, argv, appCb.getGraphicsApi(), appCb.getSamples(), appCb.getAnisotropy(), appCb.getDeepColor(), appCb.getTargetFrameTime(), false); @@ -217,9 +217,9 @@ using namespace Windows::ApplicationModel::Core; [Platform::MTAThread] int WINAPIV main(Platform::Array ^ params) { SetupBasics(false); - urde::Application appCb; + metaforce::Application appCb; auto viewProvider = - ref new boo::ViewProvider(appCb, _SYS_STR("urde"), _SYS_STR("URDE"), _SYS_STR("urde"), params, false); + ref new boo::ViewProvider(appCb, _SYS_STR("metaforce"), _SYS_STR("Metaforce"), _SYS_STR("metaforce"), params, false); CoreApplication::Run(viewProvider); return 0; } diff --git a/Editor/platforms/freedesktop/1024x1024/apps/urde.png b/Editor/platforms/freedesktop/1024x1024/apps/metaforce.png similarity index 100% rename from Editor/platforms/freedesktop/1024x1024/apps/urde.png rename to Editor/platforms/freedesktop/1024x1024/apps/metaforce.png diff --git a/Editor/platforms/freedesktop/128x128/apps/urde.png b/Editor/platforms/freedesktop/128x128/apps/metaforce.png similarity index 100% rename from Editor/platforms/freedesktop/128x128/apps/urde.png rename to Editor/platforms/freedesktop/128x128/apps/metaforce.png diff --git a/Editor/platforms/freedesktop/16x16/apps/urde.png b/Editor/platforms/freedesktop/16x16/apps/metaforce.png similarity index 100% rename from Editor/platforms/freedesktop/16x16/apps/urde.png rename to Editor/platforms/freedesktop/16x16/apps/metaforce.png diff --git a/Editor/platforms/freedesktop/256x256/apps/urde.png b/Editor/platforms/freedesktop/256x256/apps/metaforce.png similarity index 100% rename from Editor/platforms/freedesktop/256x256/apps/urde.png rename to Editor/platforms/freedesktop/256x256/apps/metaforce.png diff --git a/Editor/platforms/freedesktop/32x32/apps/urde.png b/Editor/platforms/freedesktop/32x32/apps/metaforce.png similarity index 100% rename from Editor/platforms/freedesktop/32x32/apps/urde.png rename to Editor/platforms/freedesktop/32x32/apps/metaforce.png diff --git a/Editor/platforms/freedesktop/48x48/apps/urde.png b/Editor/platforms/freedesktop/48x48/apps/metaforce.png similarity index 100% rename from Editor/platforms/freedesktop/48x48/apps/urde.png rename to Editor/platforms/freedesktop/48x48/apps/metaforce.png diff --git a/Editor/platforms/freedesktop/512x512/apps/urde.png b/Editor/platforms/freedesktop/512x512/apps/metaforce.png similarity index 100% rename from Editor/platforms/freedesktop/512x512/apps/urde.png rename to Editor/platforms/freedesktop/512x512/apps/metaforce.png diff --git a/Editor/platforms/freedesktop/64x64/apps/urde.png b/Editor/platforms/freedesktop/64x64/apps/metaforce.png similarity index 100% rename from Editor/platforms/freedesktop/64x64/apps/urde.png rename to Editor/platforms/freedesktop/64x64/apps/metaforce.png diff --git a/Editor/platforms/freedesktop/CMakeLists.txt b/Editor/platforms/freedesktop/CMakeLists.txt index ea3470e63..990fbf1cb 100644 --- a/Editor/platforms/freedesktop/CMakeLists.txt +++ b/Editor/platforms/freedesktop/CMakeLists.txt @@ -7,11 +7,11 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/Editor/platforms/freedesktop/maini COMMAND $ ARGS ${CMAKE_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_netwm.bin DEPENDS - ${CMAKE_SOURCE_DIR}/Editor/platforms/freedesktop/128x128/apps/urde.png - ${CMAKE_SOURCE_DIR}/Editor/platforms/freedesktop/64x64/apps/urde.png - ${CMAKE_SOURCE_DIR}/Editor/platforms/freedesktop/48x48/apps/urde.png - ${CMAKE_SOURCE_DIR}/Editor/platforms/freedesktop/32x32/apps/urde.png - ${CMAKE_SOURCE_DIR}/Editor/platforms/freedesktop/16x16/apps/urde.png + ${CMAKE_SOURCE_DIR}/Editor/platforms/freedesktop/128x128/apps/metaforce.png + ${CMAKE_SOURCE_DIR}/Editor/platforms/freedesktop/64x64/apps/metaforce.png + ${CMAKE_SOURCE_DIR}/Editor/platforms/freedesktop/48x48/apps/metaforce.png + ${CMAKE_SOURCE_DIR}/Editor/platforms/freedesktop/32x32/apps/metaforce.png + ${CMAKE_SOURCE_DIR}/Editor/platforms/freedesktop/16x16/apps/metaforce.png WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Editor/platforms/freedesktop COMMENT "Generating mainicon_netwm.bin") bintoc(mainicon_netwm.cpp ${CMAKE_BINARY_DIR}/Editor/platforms/freedesktop/mainicon_netwm.bin MAINICON_NETWM) diff --git a/Editor/platforms/freedesktop/mkwmicon.c b/Editor/platforms/freedesktop/mkwmicon.c index 49c0e5949..d3e0dd55c 100644 --- a/Editor/platforms/freedesktop/mkwmicon.c +++ b/Editor/platforms/freedesktop/mkwmicon.c @@ -49,7 +49,7 @@ int main(int argc, char* argv[]) printf("Rendering main icon @%dx%d\n", *d, *d); fflush(stdout); - snprintf(command, 2048, "%dx%d/apps/urde.png", *d, *d); + snprintf(command, 2048, "%dx%d/apps/metaforce.png", *d, *d); FILE* fp = fopen(command, "rb"); if (!fp) { diff --git a/Editor/platforms/freedesktop/urde.desktop b/Editor/platforms/freedesktop/urde.desktop index 6c084fadc..a79047f29 100644 --- a/Editor/platforms/freedesktop/urde.desktop +++ b/Editor/platforms/freedesktop/urde.desktop @@ -2,8 +2,8 @@ Name=URDE GenericName=Game Data Editor Comment=Edit 3D assets from games by Retro Studios -Exec=urde -Icon=urde +Exec=metaforce +Icon=metaforce Terminal=false Type=Application Categories=Graphics;3DGraphics; diff --git a/Editor/platforms/win/Assets/urde.scale-100.png b/Editor/platforms/win/Assets/metaforce.scale-100.png similarity index 100% rename from Editor/platforms/win/Assets/urde.scale-100.png rename to Editor/platforms/win/Assets/metaforce.scale-100.png diff --git a/Editor/platforms/win/Assets/urde.scale-125.png b/Editor/platforms/win/Assets/metaforce.scale-125.png similarity index 100% rename from Editor/platforms/win/Assets/urde.scale-125.png rename to Editor/platforms/win/Assets/metaforce.scale-125.png diff --git a/Editor/platforms/win/Assets/urde.scale-150.png b/Editor/platforms/win/Assets/metaforce.scale-150.png similarity index 100% rename from Editor/platforms/win/Assets/urde.scale-150.png rename to Editor/platforms/win/Assets/metaforce.scale-150.png diff --git a/Editor/platforms/win/Assets/urde.scale-200.png b/Editor/platforms/win/Assets/metaforce.scale-200.png similarity index 100% rename from Editor/platforms/win/Assets/urde.scale-200.png rename to Editor/platforms/win/Assets/metaforce.scale-200.png diff --git a/Editor/platforms/win/Assets/urde.scale-400.png b/Editor/platforms/win/Assets/metaforce.scale-400.png similarity index 100% rename from Editor/platforms/win/Assets/urde.scale-400.png rename to Editor/platforms/win/Assets/metaforce.scale-400.png diff --git a/Editor/platforms/win/Package.appxmanifest b/Editor/platforms/win/Package.appxmanifest index a1a723ccd..10d314de8 100644 --- a/Editor/platforms/win/Package.appxmanifest +++ b/Editor/platforms/win/Package.appxmanifest @@ -1,11 +1,11 @@  - + - URDE + Metaforce AxioDL - Assets\urde.png + Assets\metaforce.png @@ -15,7 +15,7 @@ - + diff --git a/Editor/platforms/win/urde.aps b/Editor/platforms/win/metaforce.aps similarity index 100% rename from Editor/platforms/win/urde.aps rename to Editor/platforms/win/metaforce.aps diff --git a/Editor/platforms/win/urde.manifest b/Editor/platforms/win/metaforce.manifest similarity index 100% rename from Editor/platforms/win/urde.manifest rename to Editor/platforms/win/metaforce.manifest diff --git a/Editor/platforms/win/urde.rc.in b/Editor/platforms/win/metaforce.rc.in similarity index 100% rename from Editor/platforms/win/urde.rc.in rename to Editor/platforms/win/metaforce.rc.in diff --git a/NESEmulator/CNESEmulator.cpp b/NESEmulator/CNESEmulator.cpp index e408e9e34..cb84aee4f 100644 --- a/NESEmulator/CNESEmulator.cpp +++ b/NESEmulator/CNESEmulator.cpp @@ -14,7 +14,7 @@ #include #include -static urde::MP1::CNESEmulator* EmulatorInst = nullptr; +static metaforce::MP1::CNESEmulator* EmulatorInst = nullptr; extern "C" { @@ -166,7 +166,7 @@ int audioUpdate() { } } -namespace urde::MP1 { +namespace metaforce::MP1 { bool CNESEmulator::EmulatorConstructed = false; static logvisor::Module Log("CNESEmulator"); @@ -781,4 +781,4 @@ void CNESEmulator::LoadPassword(const u8* state) { x38_passwordPending = true; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/NESEmulator/CNESEmulator.hpp b/NESEmulator/CNESEmulator.hpp index f1529be57..0dc4dd74f 100644 --- a/NESEmulator/CNESEmulator.hpp +++ b/NESEmulator/CNESEmulator.hpp @@ -6,7 +6,7 @@ #include "boo/audiodev/IAudioVoice.hpp" #include "zeus/CMatrix4f.hpp" -namespace urde { +namespace metaforce { struct CFinalInput; class IDvdRequest; @@ -86,4 +86,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/NESEmulator/CNESShader.cpp b/NESEmulator/CNESShader.cpp index 63c18e70f..c7d57e2fb 100644 --- a/NESEmulator/CNESShader.cpp +++ b/NESEmulator/CNESShader.cpp @@ -2,7 +2,7 @@ #include "Graphics/CGraphics.hpp" #include "hecl/Pipeline.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { boo::ObjToken CNESShader::g_Pipeline; @@ -21,4 +21,4 @@ boo::ObjToken CNESShader::BuildShaderDataBinding(boo::I void CNESShader::Shutdown() { g_Pipeline.reset(); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/NESEmulator/CNESShader.hpp b/NESEmulator/CNESShader.hpp index dc315ff17..1fa513b63 100644 --- a/NESEmulator/CNESShader.hpp +++ b/NESEmulator/CNESShader.hpp @@ -2,7 +2,7 @@ #include "boo/graphicsdev/IGraphicsDataFactory.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CNESShader { public: @@ -17,4 +17,4 @@ public: static boo::ObjToken g_Pipeline; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/README.md b/README.md index 5e664cb29..32df112a7 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Everything else is much too experimental to make portable/stable release builds * Extract ISO: `hecl extract [path].iso -o mp1` * `mp1` can be substituted with the directory name of your choice * Repackage game for Metaforce: `cd mp1; hecl package` -* Run Metaforce: `urde mp1/out` +* Run Metaforce: `metaforce mp1/out` ### Usage (Wii versions) @@ -33,7 +33,7 @@ NFS files dumped from Metroid Prime Trilogy on Wii U VC can be used directly wit * `mpt` can be substituted with the directory name of your choice * Repackage game for Metaforce: `cd mpt; hecl package MP1` * The `MP1` parameter is important here. -* Run Metaforce: `urde mpt/out` +* Run Metaforce: `metaforce mpt/out` #### Metaforce options (non-exhaustive) diff --git a/Runtime/Audio/CAudioGroupSet.cpp b/Runtime/Audio/CAudioGroupSet.cpp index db20e67c8..83ca2f65a 100644 --- a/Runtime/Audio/CAudioGroupSet.cpp +++ b/Runtime/Audio/CAudioGroupSet.cpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { amuse::AudioGroupData CAudioGroupSet::LoadData() { const auto readU32 = [](const u8* ptr) { @@ -33,9 +33,9 @@ amuse::AudioGroupData CAudioGroupSet::LoadData() { CAudioGroupSet::CAudioGroupSet(std::unique_ptr&& in) : m_buffer(std::move(in)), m_data(LoadData()) {} -CFactoryFnReturn FAudioGroupSetDataFactory(const urde::SObjectTag& tag, std::unique_ptr&& in, u32 len, - const urde::CVParamTransfer& vparms, CObjectReference* selfRef) { +CFactoryFnReturn FAudioGroupSetDataFactory(const metaforce::SObjectTag& tag, std::unique_ptr&& in, u32 len, + const metaforce::CVParamTransfer& vparms, CObjectReference* selfRef) { return TToken::GetIObjObjectFor(std::make_unique(std::move(in))); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Audio/CAudioGroupSet.hpp b/Runtime/Audio/CAudioGroupSet.hpp index d0b8c968b..4bbaf333e 100644 --- a/Runtime/Audio/CAudioGroupSet.hpp +++ b/Runtime/Audio/CAudioGroupSet.hpp @@ -11,7 +11,7 @@ #include -namespace urde { +namespace metaforce { class CAudioGroupSet { std::unique_ptr m_buffer; @@ -26,7 +26,7 @@ public: std::string_view GetName() const { return x20_name; } }; -CFactoryFnReturn FAudioGroupSetDataFactory(const urde::SObjectTag& tag, std::unique_ptr&& in, u32 len, - const urde::CVParamTransfer& vparms, CObjectReference* selfRef); +CFactoryFnReturn FAudioGroupSetDataFactory(const metaforce::SObjectTag& tag, std::unique_ptr&& in, u32 len, + const metaforce::CVParamTransfer& vparms, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Audio/CAudioSys.cpp b/Runtime/Audio/CAudioSys.cpp index eb1c03818..49298644c 100644 --- a/Runtime/Audio/CAudioSys.cpp +++ b/Runtime/Audio/CAudioSys.cpp @@ -6,7 +6,7 @@ #include "Runtime/CSimplePool.hpp" #include "Runtime/Audio/CAudioGroupSet.hpp" -namespace urde { +namespace metaforce { namespace { std::unordered_map> mpGroupSetDB; std::unordered_map mpGroupSetResNameDB; @@ -96,4 +96,4 @@ void CAudioSys::SetDefaultVolumeScale(s16 scale) { s_DefaultVolumeScale = scale; void CAudioSys::SetVolumeScale(s16 scale) { s_VolumeScale = scale; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Audio/CAudioSys.hpp b/Runtime/Audio/CAudioSys.hpp index dd0cfd1d8..31ef27484 100644 --- a/Runtime/Audio/CAudioSys.hpp +++ b/Runtime/Audio/CAudioSys.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class CAudioGroupSet; class CSimplePool; @@ -65,4 +65,4 @@ public: static void SetVolumeScale(s16 scale); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Audio/CMidiManager.cpp b/Runtime/Audio/CMidiManager.cpp index efaecf6e0..14332d621 100644 --- a/Runtime/Audio/CMidiManager.cpp +++ b/Runtime/Audio/CMidiManager.cpp @@ -1,6 +1,6 @@ #include "Runtime/Audio/CMidiManager.hpp" -namespace urde { +namespace metaforce { std::unordered_set CMidiManager::m_MidiWrappers = {}; @@ -49,4 +49,4 @@ CFactoryFnReturn FMidiDataFactory(const SObjectTag& tag, CInputStream& in, const return TToken::GetIObjObjectFor(std::make_unique(in)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Audio/CMidiManager.hpp b/Runtime/Audio/CMidiManager.hpp index 75b915473..1114cb8c6 100644 --- a/Runtime/Audio/CMidiManager.hpp +++ b/Runtime/Audio/CMidiManager.hpp @@ -4,7 +4,7 @@ #include "Runtime/Audio/CSfxManager.hpp" -namespace urde { +namespace metaforce { class CMidiManager { public: @@ -55,4 +55,4 @@ CFactoryFnReturn FMidiDataFactory(const SObjectTag& tag, CInputStream& in, const using CMidiHandle = CMidiManager::CMidiHandle; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Audio/CSfxManager.cpp b/Runtime/Audio/CSfxManager.cpp index 71d1caeb2..8394782d4 100644 --- a/Runtime/Audio/CSfxManager.cpp +++ b/Runtime/Audio/CSfxManager.cpp @@ -2,7 +2,7 @@ #include "Runtime/CSimplePool.hpp" -namespace urde { +namespace metaforce { static TLockedToken> mpSfxTranslationTableTok; std::vector* CSfxManager::mpSfxTranslationTable = nullptr; @@ -659,4 +659,4 @@ void CSfxManager::Shutdown() { DisableAuxCallback(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Audio/CSfxManager.hpp b/Runtime/Audio/CSfxManager.hpp index f3b60285f..66fff0155 100644 --- a/Runtime/Audio/CSfxManager.hpp +++ b/Runtime/Audio/CSfxManager.hpp @@ -11,7 +11,7 @@ #include -namespace urde { +namespace metaforce { class CSfxManager { static std::vector* mpSfxTranslationTable; @@ -239,4 +239,4 @@ public: using CSfxHandle = CSfxManager::CSfxHandle; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Audio/CStaticAudioPlayer.cpp b/Runtime/Audio/CStaticAudioPlayer.cpp index 67434226d..713b73c1a 100644 --- a/Runtime/Audio/CStaticAudioPlayer.cpp +++ b/Runtime/Audio/CStaticAudioPlayer.cpp @@ -3,7 +3,7 @@ #include "Runtime/CDvdFile.hpp" #include "Runtime/CDvdRequest.hpp" -namespace urde { +namespace metaforce { #define RSF_BUFFER_SIZE 0x20000 @@ -99,4 +99,4 @@ void CStaticAudioPlayer::Decode(s16* bufOut, u32 numSamples) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Audio/CStaticAudioPlayer.hpp b/Runtime/Audio/CStaticAudioPlayer.hpp index 8ffb59460..0625b68ca 100644 --- a/Runtime/Audio/CStaticAudioPlayer.hpp +++ b/Runtime/Audio/CStaticAudioPlayer.hpp @@ -13,7 +13,7 @@ #include #include -namespace urde { +namespace metaforce { class IDvdRequest; class CStaticAudioPlayer { @@ -72,4 +72,4 @@ public: void StopMixing() { m_voice->stop(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Audio/CStreamAudioManager.cpp b/Runtime/Audio/CStreamAudioManager.cpp index ffc9ef0f5..810c52822 100644 --- a/Runtime/Audio/CStreamAudioManager.cpp +++ b/Runtime/Audio/CStreamAudioManager.cpp @@ -13,7 +13,7 @@ #include -namespace urde { +namespace metaforce { class CDSPStreamManager; static u32 s_HandleCounter = 0; @@ -1042,4 +1042,4 @@ u8 CStreamAudioManager::g_SfxVolume = 0x7f; bool CStreamAudioManager::g_MusicUnmute = true; bool CStreamAudioManager::g_SfxUnmute = true; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Audio/CStreamAudioManager.hpp b/Runtime/Audio/CStreamAudioManager.hpp index 10b5b1479..6777c6b8f 100644 --- a/Runtime/Audio/CStreamAudioManager.hpp +++ b/Runtime/Audio/CStreamAudioManager.hpp @@ -4,7 +4,7 @@ #include "Runtime/GCNTypes.hpp" -namespace urde { +namespace metaforce { class CStreamAudioManager { static u8 g_MusicVolume; @@ -34,4 +34,4 @@ public: static void Shutdown(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CAutoMapper.cpp b/Runtime/AutoMapper/CAutoMapper.cpp index 4a53496fb..cfdc93a3d 100644 --- a/Runtime/AutoMapper/CAutoMapper.cpp +++ b/Runtime/AutoMapper/CAutoMapper.cpp @@ -16,7 +16,7 @@ #include -namespace urde { +namespace metaforce { void CAutoMapper::SAutoMapperRenderState::InterpolateWithClamp(const SAutoMapperRenderState& a, SAutoMapperRenderState& out, @@ -1628,4 +1628,4 @@ void CAutoMapper::OnNewInGameGuiState(EInGameGuiState state, CStateManager& mgr) } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CAutoMapper.hpp b/Runtime/AutoMapper/CAutoMapper.hpp index 063f57f10..c564518a2 100644 --- a/Runtime/AutoMapper/CAutoMapper.hpp +++ b/Runtime/AutoMapper/CAutoMapper.hpp @@ -17,7 +17,7 @@ #include #include -namespace urde { +namespace metaforce { class CMapWorldInfo; class CStateManager; class IWorld; @@ -275,4 +275,4 @@ public: return 0.f; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CMapArea.cpp b/Runtime/AutoMapper/CMapArea.cpp index 7ef16f942..3717e5ae9 100644 --- a/Runtime/AutoMapper/CMapArea.cpp +++ b/Runtime/AutoMapper/CMapArea.cpp @@ -10,7 +10,7 @@ #include "Runtime/World/CGameArea.hpp" #include "Runtime/World/CWorld.hpp" -namespace urde { +namespace metaforce { constexpr std::array MinesPostTransforms{{ {0.f, 0.f, 200.f}, {0.f, 0.f, 0.f}, @@ -304,4 +304,4 @@ CFactoryFnReturn FMapAreaFactory(const SObjectTag& objTag, CInputStream& in, con return TToken::GetIObjObjectFor(std::make_unique(in, size)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CMapArea.hpp b/Runtime/AutoMapper/CMapArea.hpp index 3559b4479..d426c5301 100644 --- a/Runtime/AutoMapper/CMapArea.hpp +++ b/Runtime/AutoMapper/CMapArea.hpp @@ -14,7 +14,7 @@ #include #include -namespace urde { +namespace metaforce { class IWorld; class CMapArea { public: @@ -86,4 +86,4 @@ public: }; CFactoryFnReturn FMapAreaFactory(const SObjectTag& objTag, CInputStream& in, const CVParamTransfer&, CObjectReference*); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CMapUniverse.cpp b/Runtime/AutoMapper/CMapUniverse.cpp index c9db5b12d..84f68f034 100644 --- a/Runtime/AutoMapper/CMapUniverse.cpp +++ b/Runtime/AutoMapper/CMapUniverse.cpp @@ -4,7 +4,7 @@ #include "Runtime/CGameState.hpp" #include "Runtime/GameGlobalObjects.hpp" -namespace urde { +namespace metaforce { CMapUniverse::CMapUniverse(CInputStream& in, u32 version) : x0_hexagonId(in.readUint32Big()) { x4_hexagonToken = g_SimplePool->GetObj({FOURCC('MAPA'), x0_hexagonId}); @@ -121,4 +121,4 @@ CFactoryFnReturn FMapUniverseFactory(const SObjectTag&, CInputStream& in, const return TToken::GetIObjObjectFor(std::make_unique(in, version)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CMapUniverse.hpp b/Runtime/AutoMapper/CMapUniverse.hpp index 4b7254070..d609cf505 100644 --- a/Runtime/AutoMapper/CMapUniverse.hpp +++ b/Runtime/AutoMapper/CMapUniverse.hpp @@ -12,7 +12,7 @@ #include #include -namespace urde { +namespace metaforce { class CStateManager; class CMapUniverse { public: @@ -124,4 +124,4 @@ public: CFactoryFnReturn FMapUniverseFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference*); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CMapWorld.cpp b/Runtime/AutoMapper/CMapWorld.cpp index 90c6502ac..fe58b2c0f 100644 --- a/Runtime/AutoMapper/CMapWorld.cpp +++ b/Runtime/AutoMapper/CMapWorld.cpp @@ -9,7 +9,7 @@ #include "Runtime/AutoMapper/CMapWorldInfo.hpp" #include "Runtime/World/CWorld.hpp" -namespace urde { +namespace metaforce { namespace { struct Support { int x0_; @@ -698,4 +698,4 @@ CFactoryFnReturn FMapWorldFactory(const SObjectTag& tag, CInputStream& in, const return TToken::GetIObjObjectFor(std::make_unique(in)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CMapWorld.hpp b/Runtime/AutoMapper/CMapWorld.hpp index 554b0d5c2..fb851bcea 100644 --- a/Runtime/AutoMapper/CMapWorld.hpp +++ b/Runtime/AutoMapper/CMapWorld.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CMapWorldInfo; class CStateManager; class IWorld; @@ -167,4 +167,4 @@ public: CFactoryFnReturn FMapWorldFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& param, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CMapWorldInfo.cpp b/Runtime/AutoMapper/CMapWorldInfo.cpp index c506e273e..18bb35ec9 100644 --- a/Runtime/AutoMapper/CMapWorldInfo.cpp +++ b/Runtime/AutoMapper/CMapWorldInfo.cpp @@ -3,7 +3,7 @@ #include "Runtime/CMemoryCardSys.hpp" #include "Runtime/GameGlobalObjects.hpp" -namespace urde { +namespace metaforce { CMapWorldInfo::CMapWorldInfo(CBitStreamReader& reader, const CSaveWorld& savw, CAssetId mlvlId) { const CSaveWorldMemory& worldMem = g_MemoryCardSys->GetSaveWorldMemory(mlvlId); @@ -117,4 +117,4 @@ bool CMapWorldInfo::IsAnythingSet() const { return x38_mapStationUsed; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CMapWorldInfo.hpp b/Runtime/AutoMapper/CMapWorldInfo.hpp index 69ac18b65..2cb325fa4 100644 --- a/Runtime/AutoMapper/CMapWorldInfo.hpp +++ b/Runtime/AutoMapper/CMapWorldInfo.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CSaveWorld; class CMapWorldInfo { @@ -31,4 +31,4 @@ public: bool IsAnythingSet() const; void SetMapStationUsed(bool isUsed) { x38_mapStationUsed = isUsed; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CMappableObject.cpp b/Runtime/AutoMapper/CMappableObject.cpp index 5305e4808..48b55b92b 100644 --- a/Runtime/AutoMapper/CMappableObject.cpp +++ b/Runtime/AutoMapper/CMappableObject.cpp @@ -7,7 +7,7 @@ #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/Graphics/CTexture.hpp" -namespace urde { +namespace metaforce { std::array CMappableObject::skDoorVerts{}; constexpr std::array DoorIndices{ @@ -265,4 +265,4 @@ void CMappableObject::Shutdown() { g_doorVbo.reset(); g_doorIbo.reset(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/AutoMapper/CMappableObject.hpp b/Runtime/AutoMapper/CMappableObject.hpp index 6bedcc1d8..fd0b2df27 100644 --- a/Runtime/AutoMapper/CMappableObject.hpp +++ b/Runtime/AutoMapper/CMappableObject.hpp @@ -13,7 +13,7 @@ #include #include -namespace urde { +namespace metaforce { class CMapWorldInfo; class CStateManager; @@ -96,4 +96,4 @@ public: } static void Shutdown(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CArchitectureMessage.hpp b/Runtime/CArchitectureMessage.hpp index 1a7926879..24722c5e1 100644 --- a/Runtime/CArchitectureMessage.hpp +++ b/Runtime/CArchitectureMessage.hpp @@ -6,7 +6,7 @@ #include "Runtime/rstl.hpp" #include "Runtime/Input/CFinalInput.hpp" -namespace urde { +namespace metaforce { class CIOWin; enum class EArchMsgTarget { @@ -142,4 +142,4 @@ public: return CArchitectureMessage(target, EArchMsgType::RemoveAllIOWins, std::make_shared()); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CArchitectureQueue.hpp b/Runtime/CArchitectureQueue.hpp index 1c14c2a47..d3d8c532b 100644 --- a/Runtime/CArchitectureQueue.hpp +++ b/Runtime/CArchitectureQueue.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/CArchitectureMessage.hpp" -namespace urde { +namespace metaforce { class CArchitectureQueue { std::list m_list; @@ -19,4 +19,4 @@ public: explicit operator bool() const { return !m_list.empty(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CBasics.hpp b/Runtime/CBasics.hpp index 431a2143c..8e76e67fe 100644 --- a/Runtime/CBasics.hpp +++ b/Runtime/CBasics.hpp @@ -6,7 +6,7 @@ #include "Runtime/GCNTypes.hpp" -namespace urde { +namespace metaforce { using OSTime = s64; @@ -41,4 +41,4 @@ public: static OSCalendarTime ToCalendarTime(std::chrono::system_clock::time_point time); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CBasicsPC.cpp b/Runtime/CBasicsPC.cpp index 2f6d95345..36262e260 100644 --- a/Runtime/CBasicsPC.cpp +++ b/Runtime/CBasicsPC.cpp @@ -24,7 +24,7 @@ static u64 MachToDolphinDenom; static LARGE_INTEGER PerfFrequency; #endif -namespace urde { +namespace metaforce { void CBasics::Initialize() { #if __APPLE__ @@ -136,4 +136,4 @@ OSCalendarTime CBasics::ToCalendarTime(std::chrono::system_clock::time_point tim return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CCRC32.cpp b/Runtime/CCRC32.cpp index 4b6e3df98..3c7fe60cc 100644 --- a/Runtime/CCRC32.cpp +++ b/Runtime/CCRC32.cpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { namespace { constexpr std::array crc32Table{ 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, @@ -62,4 +62,4 @@ uint32_t CCRC32::Calculate(const void* data, uint32_t length) { return checksum; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CCRC32.hpp b/Runtime/CCRC32.hpp index 2bd7961c2..d4fad3866 100644 --- a/Runtime/CCRC32.hpp +++ b/Runtime/CCRC32.hpp @@ -2,11 +2,11 @@ #include -namespace urde { +namespace metaforce { class CCRC32 { public: static uint32_t Calculate(const void* data, uint32_t length); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CDependencyGroup.cpp b/Runtime/CDependencyGroup.cpp index 0aa37c59b..bc6064eae 100644 --- a/Runtime/CDependencyGroup.cpp +++ b/Runtime/CDependencyGroup.cpp @@ -1,7 +1,7 @@ #include "Runtime/CDependencyGroup.hpp" #include "Runtime/CToken.hpp" -namespace urde { +namespace metaforce { CDependencyGroup::CDependencyGroup(CInputStream& in) { ReadFromStream(in); } void CDependencyGroup::ReadFromStream(CInputStream& in) { @@ -17,4 +17,4 @@ CFactoryFnReturn FDependencyGroupFactory([[maybe_unused]] const SObjectTag& tag, return TToken::GetIObjObjectFor(std::make_unique(in)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CDependencyGroup.hpp b/Runtime/CDependencyGroup.hpp index e38a176d2..40f5bb1f2 100644 --- a/Runtime/CDependencyGroup.hpp +++ b/Runtime/CDependencyGroup.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/CFactoryMgr.hpp" -namespace urde { +namespace metaforce { class CDependencyGroup { std::vector x0_objectTags; @@ -15,4 +15,4 @@ public: CFactoryFnReturn FDependencyGroupFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& param, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CDvdFile.cpp b/Runtime/CDvdFile.cpp index 703b5060e..94ec79905 100644 --- a/Runtime/CDvdFile.cpp +++ b/Runtime/CDvdFile.cpp @@ -3,7 +3,7 @@ #include "Runtime/CDvdRequest.hpp" #include "Runtime/CStopwatch.hpp" -namespace urde { +namespace metaforce { hecl::ProjectPath CDvdFile::m_DvdRoot; std::unordered_map CDvdFile::m_caseInsensitiveMap; @@ -149,4 +149,4 @@ void CDvdFile::Shutdown() { m_RequestQueue.clear(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CDvdFile.hpp b/Runtime/CDvdFile.hpp index 5cb6007f6..53a3d2357 100644 --- a/Runtime/CDvdFile.hpp +++ b/Runtime/CDvdFile.hpp @@ -13,7 +13,7 @@ #include -namespace urde { +namespace metaforce { enum class ESeekOrigin { Begin = 0, Cur = 1, End = 2 }; @@ -63,4 +63,4 @@ public: u64 Length() const { return m_reader->length(); } std::string_view GetPath() const { return x18_path; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CDvdRequest.hpp b/Runtime/CDvdRequest.hpp index 6b34d5373..de7c070f6 100644 --- a/Runtime/CDvdRequest.hpp +++ b/Runtime/CDvdRequest.hpp @@ -1,6 +1,6 @@ #pragma once -namespace urde { +namespace metaforce { class IDvdRequest { public: @@ -14,4 +14,4 @@ public: virtual EMediaType GetMediaType() const = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CFactoryMgr.cpp b/Runtime/CFactoryMgr.cpp index 46f8893f5..bc285cc86 100644 --- a/Runtime/CFactoryMgr.cpp +++ b/Runtime/CFactoryMgr.cpp @@ -8,7 +8,7 @@ #include "Runtime/CStopwatch.hpp" #include "Runtime/IObj.hpp" -namespace urde { +namespace metaforce { constexpr std::array TypeTable{ FOURCC('CLSN'), FOURCC('CMDL'), FOURCC('CSKR'), FOURCC('ANIM'), FOURCC('CINF'), FOURCC('TXTR'), FOURCC('PLTT'), FOURCC('FONT'), FOURCC('ANCS'), FOURCC('EVNT'), FOURCC('MADF'), FOURCC('MLVL'), FOURCC('MREA'), FOURCC('MAPW'), @@ -18,7 +18,7 @@ constexpr std::array TypeTable{ FOURCC('HINT'), FOURCC('MAPU'), FOURCC('DUMB'), FOURCC('OIDS'), }; -CFactoryFnReturn CFactoryMgr::MakeObject(const SObjectTag& tag, urde::CInputStream& in, +CFactoryFnReturn CFactoryMgr::MakeObject(const SObjectTag& tag, metaforce::CInputStream& in, const CVParamTransfer& paramXfer, CObjectReference* selfRef) { auto search = m_factories.find(tag.type); if (search == m_factories.end()) @@ -27,7 +27,7 @@ CFactoryFnReturn CFactoryMgr::MakeObject(const SObjectTag& tag, urde::CInputStre return search->second(tag, in, paramXfer, selfRef); } -bool CFactoryMgr::CanMakeMemory(const urde::SObjectTag& tag) const { +bool CFactoryMgr::CanMakeMemory(const metaforce::SObjectTag& tag) const { auto search = m_memFactories.find(tag.type); return search != m_memFactories.cend(); } @@ -81,4 +81,4 @@ CFactoryMgr::ETypeTable CFactoryMgr::FourCCToTypeIdx(FourCC fcc) { FourCC CFactoryMgr::TypeIdxToFourCC(ETypeTable fcc) { return TypeTable[size_t(fcc)]; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CFactoryMgr.hpp b/Runtime/CFactoryMgr.hpp index db048d82e..0f5b3e8b3 100644 --- a/Runtime/CFactoryMgr.hpp +++ b/Runtime/CFactoryMgr.hpp @@ -6,7 +6,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { struct SObjectTag; class CVParamTransfer; class IObj; @@ -16,9 +16,9 @@ class CFactoryMgr { std::unordered_map m_memFactories; public: - CFactoryFnReturn MakeObject(const SObjectTag& tag, urde::CInputStream& in, const CVParamTransfer& paramXfer, + CFactoryFnReturn MakeObject(const SObjectTag& tag, metaforce::CInputStream& in, const CVParamTransfer& paramXfer, CObjectReference* selfRef); - bool CanMakeMemory(const urde::SObjectTag& tag) const; + bool CanMakeMemory(const metaforce::SObjectTag& tag) const; CFactoryFnReturn MakeObjectFromMemory(const SObjectTag& tag, std::unique_ptr&& buf, int size, bool compressed, const CVParamTransfer& paramXfer, CObjectReference* selfRef); void AddFactory(FourCC key, FFactoryFunc func) { m_factories.insert_or_assign(key, std::move(func)); } @@ -71,4 +71,4 @@ public: static FourCC TypeIdxToFourCC(ETypeTable fcc); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CGameAllocator.cpp b/Runtime/CGameAllocator.cpp index 59b045635..ce786ff48 100644 --- a/Runtime/CGameAllocator.cpp +++ b/Runtime/CGameAllocator.cpp @@ -1,7 +1,7 @@ #include "Runtime/CGameAllocator.hpp" -namespace urde { -logvisor::Module AllocLog("urde::CGameAllocator"); +namespace metaforce { +logvisor::Module AllocLog("metaforce::CGameAllocator"); #pragma GCC diagnostic ignored "-Wclass-memaccess" @@ -54,4 +54,4 @@ void CGameAllocator::Free(u8* ptr) { /* Invalidate chunk allocation descriptor */ memset(info, 0, ROUND_UP_64(info->len + sizeof(SChunkDescription))); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CGameAllocator.hpp b/Runtime/CGameAllocator.hpp index a80500ca9..6bdeb3b24 100644 --- a/Runtime/CGameAllocator.hpp +++ b/Runtime/CGameAllocator.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CGameAllocator { struct SAllocationDescription { std::unique_ptr memptr; @@ -27,4 +27,4 @@ public: static u8* Alloc(size_t len); static void Free(u8* ptr); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CGameDebug.hpp b/Runtime/CGameDebug.hpp index 0a94ffbfa..f4519b01a 100644 --- a/Runtime/CGameDebug.hpp +++ b/Runtime/CGameDebug.hpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { struct CFinalInput; const char* StringForControlOption(int); @@ -39,4 +39,4 @@ public: void AddDebugOption(const CDebugOption&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CGameHintInfo.cpp b/Runtime/CGameHintInfo.cpp index 887e15224..be625c576 100644 --- a/Runtime/CGameHintInfo.cpp +++ b/Runtime/CGameHintInfo.cpp @@ -4,7 +4,7 @@ #include "Runtime/CToken.hpp" #include "Runtime/GameGlobalObjects.hpp" -namespace urde { +namespace metaforce { CGameHintInfo::CGameHintInfo(CInputStream& in, s32 version) { u32 hintCount = in.readUint32Big(); @@ -45,4 +45,4 @@ CFactoryFnReturn FHintFactory(const SObjectTag&, CInputStream& in, const CVParam return TToken::GetIObjObjectFor(std::make_unique(in, version)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CGameHintInfo.hpp b/Runtime/CGameHintInfo.hpp index 0ce7b2caa..96b04e070 100644 --- a/Runtime/CGameHintInfo.hpp +++ b/Runtime/CGameHintInfo.hpp @@ -6,7 +6,7 @@ #include "Runtime/IFactory.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CGameHintInfo { public: struct SHintLocation { @@ -46,4 +46,4 @@ public: }; CFactoryFnReturn FHintFactory(const SObjectTag&, CInputStream&, const CVParamTransfer&, CObjectReference*); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CGameOptions.cpp b/Runtime/CGameOptions.cpp index c2cea850d..b4bebcce3 100644 --- a/Runtime/CGameOptions.cpp +++ b/Runtime/CGameOptions.cpp @@ -16,7 +16,7 @@ #include -namespace urde { +namespace metaforce { constexpr std::array VisorOpts{{ {EGameOption::VisorOpacity, 21, 0.f, 255.f, 1.f, EOptionType::Float}, @@ -752,4 +752,4 @@ void CHintOptions::Update(float dt, const CStateManager& stateMgr) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CGameOptions.hpp b/Runtime/CGameOptions.hpp index dd4a56caf..b8c7f20e6 100644 --- a/Runtime/CGameOptions.hpp +++ b/Runtime/CGameOptions.hpp @@ -8,7 +8,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Audio/CAudioSys.hpp" -namespace urde { +namespace metaforce { struct CFinalInput; class CStateManager; @@ -203,4 +203,4 @@ public: void Update(float dt, const CStateManager& stateMgr); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CGameOptionsTouchBar.cpp b/Runtime/CGameOptionsTouchBar.cpp index 5b4415167..b9789a109 100644 --- a/Runtime/CGameOptionsTouchBar.cpp +++ b/Runtime/CGameOptionsTouchBar.cpp @@ -1,6 +1,6 @@ #include "Runtime/CGameOptionsTouchBar.hpp" -namespace urde { +namespace metaforce { CGameOptionsTouchBar::EAction CGameOptionsTouchBar::PopAction() { return EAction::None; } @@ -17,4 +17,4 @@ void CGameOptionsTouchBar::SetSelection([[maybe_unused]] int left, [[maybe_unuse std::unique_ptr NewGameOptionsTouchBar() { return std::make_unique(); } #endif -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CGameOptionsTouchBar.hpp b/Runtime/CGameOptionsTouchBar.hpp index 302aef98a..832e0d4c3 100644 --- a/Runtime/CGameOptionsTouchBar.hpp +++ b/Runtime/CGameOptionsTouchBar.hpp @@ -3,7 +3,7 @@ #include #include -namespace urde { +namespace metaforce { class CGameOptionsTouchBar { public: @@ -17,4 +17,4 @@ public: std::unique_ptr NewGameOptionsTouchBar(); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CGameOptionsTouchBarMac.mm b/Runtime/CGameOptionsTouchBarMac.mm index 57db0df74..334e1460e 100644 --- a/Runtime/CGameOptionsTouchBarMac.mm +++ b/Runtime/CGameOptionsTouchBarMac.mm @@ -17,8 +17,8 @@ static NSColor* BlueConfirm() @interface GameOptionsTouchBar : NSObject { @public - urde::CStringTable* _pauseScreenStrg; - urde::CGameOptionsTouchBar::EAction _action; + metaforce::CStringTable* _pauseScreenStrg; + metaforce::CGameOptionsTouchBar::EAction _action; std::pair _selection; int _value, _pendingValue; } @@ -60,7 +60,7 @@ static NSColor* BlueConfirm() } else if (_selection.second == -1) { - const std::pair& opt = urde::GameOptionsRegistry[_selection.first]; + const std::pair& opt = metaforce::GameOptionsRegistry[_selection.first]; items = [NSMutableArray arrayWithCapacity:opt.first+1]; [items addObject:@"back"]; for (int i=0 ; i& opt = urde::GameOptionsRegistry[_selection.first]; - const urde::SGameOption& subopt = opt.second[_selection.second]; - if (subopt.type == urde::EOptionType::Float) + const std::pair& opt = metaforce::GameOptionsRegistry[_selection.first]; + const metaforce::SGameOption& subopt = opt.second[_selection.second]; + if (subopt.type == metaforce::EOptionType::Float) items = @[@"back", @"value"]; - else if (subopt.type == urde::EOptionType::DoubleEnum) + else if (subopt.type == metaforce::EOptionType::DoubleEnum) items = @[@"back", @"label", @"double0", @"double1"]; - else if (subopt.type == urde::EOptionType::TripleEnum) + else if (subopt.type == metaforce::EOptionType::TripleEnum) items = @[@"back", @"label", @"triple0", @"triple1", @"triple2"]; } touchBar.customizationRequiredItemIdentifiers = items; @@ -92,8 +92,8 @@ static NSColor* BlueConfirm() } else if ([identifier isEqualToString:@"label"]) { - const std::pair& opt = urde::GameOptionsRegistry[_selection.first]; - const urde::SGameOption& subopt = opt.second[_selection.second]; + const std::pair& opt = metaforce::GameOptionsRegistry[_selection.first]; + const metaforce::SGameOption& subopt = opt.second[_selection.second]; const char16_t* cStr = _pauseScreenStrg->GetString(subopt.stringId); NSString* str = [NSString stringWithUTF8String:hecl::Char16ToUTF8(cStr).c_str()]; @@ -105,8 +105,8 @@ static NSColor* BlueConfirm() } else if ([identifier isEqualToString:@"value"]) { - const std::pair& opt = urde::GameOptionsRegistry[_selection.first]; - const urde::SGameOption& subopt = opt.second[_selection.second]; + const std::pair& opt = metaforce::GameOptionsRegistry[_selection.first]; + const metaforce::SGameOption& subopt = opt.second[_selection.second]; const char16_t* cStr = _pauseScreenStrg->GetString(subopt.stringId); NSString* str = [NSString stringWithUTF8String:hecl::Char16ToUTF8(cStr).c_str()]; @@ -200,9 +200,9 @@ static NSColor* BlueConfirm() } else if ([first isEqualToString:@"right"]) { - const std::pair& opt = urde::GameOptionsRegistry[_selection.first]; + const std::pair& opt = metaforce::GameOptionsRegistry[_selection.first]; auto idx = strtoul([[pc objectAtIndex:1] UTF8String], nullptr, 10); - const urde::SGameOption& subopt = opt.second[idx]; + const metaforce::SGameOption& subopt = opt.second[idx]; const char16_t* cStr = _pauseScreenStrg->GetString(subopt.stringId); NSString* str = [NSString stringWithUTF8String:hecl::Char16ToUTF8(cStr).c_str()]; @@ -218,41 +218,41 @@ static NSColor* BlueConfirm() } -(IBAction)onBack:(id)sender { - _action = urde::CGameOptionsTouchBar::EAction::Back; + _action = metaforce::CGameOptionsTouchBar::EAction::Back; } -(IBAction)onSlide:(id)sender { _pendingValue = [((NSSliderTouchBarItem*)sender).slider intValue]; - _action = urde::CGameOptionsTouchBar::EAction::ValueChange; + _action = metaforce::CGameOptionsTouchBar::EAction::ValueChange; } -(IBAction)onSet0:(id)sender { _pendingValue = 0; - _action = urde::CGameOptionsTouchBar::EAction::ValueChange; + _action = metaforce::CGameOptionsTouchBar::EAction::ValueChange; } -(IBAction)onSet1:(id)sender { _pendingValue = 1; - _action = urde::CGameOptionsTouchBar::EAction::ValueChange; + _action = metaforce::CGameOptionsTouchBar::EAction::ValueChange; } -(IBAction)onSet2:(id)sender { _pendingValue = 2; - _action = urde::CGameOptionsTouchBar::EAction::ValueChange; + _action = metaforce::CGameOptionsTouchBar::EAction::ValueChange; } -(IBAction)onLeft:(id)sender { _selection.first = ((NSButton*)sender).tag; - _action = urde::CGameOptionsTouchBar::EAction::Advance; + _action = metaforce::CGameOptionsTouchBar::EAction::Advance; } -(IBAction)onRight:(id)sender { _selection.second = ((NSButton*)sender).tag; - _action = urde::CGameOptionsTouchBar::EAction::Advance; + _action = metaforce::CGameOptionsTouchBar::EAction::Advance; } @end -namespace urde +namespace metaforce { class CGameOptionsTouchBarMac : public CGameOptionsTouchBar diff --git a/Runtime/CGameState.cpp b/Runtime/CGameState.cpp index 25497b69c..743f446f2 100644 --- a/Runtime/CGameState.cpp +++ b/Runtime/CGameState.cpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { union BitsToDouble { struct { #if BYTE_ORDER == __LITTLE_ENDIAN @@ -284,4 +284,4 @@ void CGameState::InitializeMemoryStates() { WriteBackupBuf(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CGameState.hpp b/Runtime/CGameState.hpp index 84d92acda..610d906ca 100644 --- a/Runtime/CGameState.hpp +++ b/Runtime/CGameState.hpp @@ -14,7 +14,7 @@ #include "Runtime/World/CWorld.hpp" #include "Runtime/World/CWorldTransManager.hpp" -namespace urde { +namespace metaforce { class CSaveWorldMemory; class CWorldLayerState { @@ -129,4 +129,4 @@ public: }; static GameFileStateInfo LoadGameFileState(const u8* data); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CIOWin.hpp b/Runtime/CIOWin.hpp index 43a3df3d8..70dcc91c0 100644 --- a/Runtime/CIOWin.hpp +++ b/Runtime/CIOWin.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CArchitectureMessage; class CArchitectureQueue; @@ -28,4 +28,4 @@ public: size_t GetNameHash() const { return m_nameHash; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CIOWinManager.cpp b/Runtime/CIOWinManager.cpp index a5fa8eb48..3c55de8e5 100644 --- a/Runtime/CIOWinManager.cpp +++ b/Runtime/CIOWinManager.cpp @@ -3,7 +3,7 @@ #include "Runtime/CArchitectureMessage.hpp" #include "Runtime/CIOWin.hpp" -namespace urde { +namespace metaforce { bool CIOWinManager::OnIOWinMessage(const CArchitectureMessage& msg) { switch (msg.GetType()) { @@ -251,4 +251,4 @@ void CIOWinManager::AddIOWin(std::weak_ptr chIow, int pumpPrio, int draw x0_drawRoot = newNode; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CIOWinManager.hpp b/Runtime/CIOWinManager.hpp index 9aadc67b8..44c86f9bb 100644 --- a/Runtime/CIOWinManager.hpp +++ b/Runtime/CIOWinManager.hpp @@ -7,7 +7,7 @@ #include "Runtime/CIOWin.hpp" #include "Runtime/rstl.hpp" -namespace urde { +namespace metaforce { class CIOWinManager { struct IOWinPQNode { @@ -37,4 +37,4 @@ public: bool IsEmpty() const { return x0_drawRoot == nullptr && x4_pumpRoot == nullptr; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CInGameTweakManagerBase.hpp b/Runtime/CInGameTweakManagerBase.hpp index 2d41a2efa..7c75ea903 100644 --- a/Runtime/CInGameTweakManagerBase.hpp +++ b/Runtime/CInGameTweakManagerBase.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CTweakValue { public: @@ -73,4 +73,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CMFGameBase.hpp b/Runtime/CMFGameBase.hpp index b73d1c71c..3a61b9f5f 100644 --- a/Runtime/CMFGameBase.hpp +++ b/Runtime/CMFGameBase.hpp @@ -2,7 +2,7 @@ #include "Runtime/CIOWin.hpp" -namespace urde { +namespace metaforce { class CMFGameBase : public CIOWin { public: @@ -14,4 +14,4 @@ public: explicit CMFGameLoaderBase(const char* name) : CIOWin(name) {} }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CMainFlowBase.cpp b/Runtime/CMainFlowBase.cpp index 478e29770..cd98a8c48 100644 --- a/Runtime/CMainFlowBase.cpp +++ b/Runtime/CMainFlowBase.cpp @@ -2,7 +2,7 @@ #include "Runtime/CArchitectureMessage.hpp" -namespace urde { +namespace metaforce { CIOWin::EMessageReturn CMainFlowBase::OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue) { switch (msg.GetType()) { @@ -21,4 +21,4 @@ CIOWin::EMessageReturn CMainFlowBase::OnMessage(const CArchitectureMessage& msg, return EMessageReturn::Normal; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CMainFlowBase.hpp b/Runtime/CMainFlowBase.hpp index f16ad0fbe..af874f924 100644 --- a/Runtime/CMainFlowBase.hpp +++ b/Runtime/CMainFlowBase.hpp @@ -2,7 +2,7 @@ #include "Runtime/CIOWin.hpp" -namespace urde { +namespace metaforce { enum class EClientFlowStates { Unspecified = -1, PreFrontEnd = 7, FrontEnd = 8, Game = 14, GameExit = 15 }; @@ -17,4 +17,4 @@ public: virtual void SetGameState(EClientFlowStates state, CArchitectureQueue& queue) = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CMemoryCardSys.cpp b/Runtime/CMemoryCardSys.cpp index bc92f6197..1f97829bf 100644 --- a/Runtime/CMemoryCardSys.cpp +++ b/Runtime/CMemoryCardSys.cpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { namespace { using ECardResult = kabufuda::ECardResult; @@ -577,4 +577,4 @@ void CMemoryCardSys::Shutdown() { UnmountCard(kabufuda::ECardSlot::SlotB); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CMemoryCardSys.hpp b/Runtime/CMemoryCardSys.hpp index 8d491bd26..2dedf83f9 100644 --- a/Runtime/CMemoryCardSys.hpp +++ b/Runtime/CMemoryCardSys.hpp @@ -14,7 +14,7 @@ #include -namespace urde { +namespace metaforce { class CDummyWorld; class CSimplePool; class CStringTable; @@ -177,4 +177,4 @@ public: static void Shutdown(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CMemoryCardSysNix.cpp b/Runtime/CMemoryCardSysNix.cpp index fa31b6cc8..c1afd706b 100644 --- a/Runtime/CMemoryCardSysNix.cpp +++ b/Runtime/CMemoryCardSysNix.cpp @@ -2,7 +2,7 @@ #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/IMain.hpp" -namespace urde { +namespace metaforce { kabufuda::SystemString CMemoryCardSys::ResolveDolphinCardPath(kabufuda::ECardSlot slot) { if (g_Main->IsUSA() && !g_Main->IsTrilogy()) { @@ -56,4 +56,4 @@ kabufuda::SystemString CMemoryCardSys::_CreateDolphinCard(kabufuda::ECardSlot sl return {}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CMemoryCardSysOSX.cpp b/Runtime/CMemoryCardSysOSX.cpp index b62be99b8..1c5628e5c 100644 --- a/Runtime/CMemoryCardSysOSX.cpp +++ b/Runtime/CMemoryCardSysOSX.cpp @@ -1,7 +1,7 @@ #include "CMemoryCardSys.hpp" #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/IMain.hpp" -namespace urde { +namespace metaforce { kabufuda::SystemString CMemoryCardSys::ResolveDolphinCardPath(kabufuda::ECardSlot slot) { if (g_Main->IsUSA() && !g_Main->IsTrilogy()) { @@ -44,4 +44,4 @@ kabufuda::SystemString CMemoryCardSys::_CreateDolphinCard(kabufuda::ECardSlot sl return {}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CMemoryCardSysWin.cpp b/Runtime/CMemoryCardSysWin.cpp index fa869cd8a..c32d83924 100644 --- a/Runtime/CMemoryCardSysWin.cpp +++ b/Runtime/CMemoryCardSysWin.cpp @@ -5,7 +5,7 @@ #include -namespace urde { +namespace metaforce { #if WINDOWS_STORE using namespace Windows::Storage; @@ -120,4 +120,4 @@ kabufuda::SystemString CMemoryCardSys::_CreateDolphinCard(kabufuda::ECardSlot sl return {}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CObjectList.cpp b/Runtime/CObjectList.cpp index e0c6a89de..e4555d11d 100644 --- a/Runtime/CObjectList.cpp +++ b/Runtime/CObjectList.cpp @@ -1,9 +1,9 @@ #include "Runtime/CObjectList.hpp" #include -namespace urde { +namespace metaforce { namespace { -logvisor::Module Log("urde::CObjectList"); +logvisor::Module Log("metaforce::CObjectList"); } CObjectList::CObjectList(EGameObjectList listEnum) : x2004_listEnum(listEnum) {} @@ -105,4 +105,4 @@ CEntity* CObjectList::GetValidObjectById(TUniqueId uid) { bool CObjectList::IsQualified(const CEntity&) const { return true; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CObjectList.hpp b/Runtime/CObjectList.hpp index 68efd1d1d..d451ef9f7 100644 --- a/Runtime/CObjectList.hpp +++ b/Runtime/CObjectList.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { enum class EGameObjectList { Invalid = -1, @@ -91,4 +91,4 @@ public: u16 size() const { return x200a_count; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CPakFile.cpp b/Runtime/CPakFile.cpp index e5b4986f5..4cb56c565 100644 --- a/Runtime/CPakFile.cpp +++ b/Runtime/CPakFile.cpp @@ -1,13 +1,13 @@ #include "Runtime/CPakFile.hpp" -namespace urde { -static logvisor::Module Log("urde::CPakFile"); +namespace metaforce { +static logvisor::Module Log("metaforce::CPakFile"); CPakFile::CPakFile(std::string_view filename, bool buildDepList, bool worldPak, bool override) : CDvdFile(filename) { if (!CDvdFile::operator bool()) Log.report(logvisor::Fatal, FMT_STRING("{}: Unable to open"), GetPath()); x28_24_buildDepList = buildDepList; - //x28_24_buildDepList = true; // Always do this so URDE can rapidly pre-warm shaders + //x28_24_buildDepList = true; // Always do this so metaforce can rapidly pre-warm shaders x28_26_worldPak = worldPak; m_override = override; } @@ -180,4 +180,4 @@ void CPakFile::AsyncIdle() { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CPakFile.hpp b/Runtime/CPakFile.hpp index e868405b6..b43ce88e5 100644 --- a/Runtime/CPakFile.hpp +++ b/Runtime/CPakFile.hpp @@ -10,7 +10,7 @@ #include "Runtime/CStringExtras.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CPakFile : public CDvdFile { friend class CResLoader; @@ -78,4 +78,4 @@ public: CAssetId GetMLVLId() const { return m_mlvlId; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CPlayMovieBase.hpp b/Runtime/CPlayMovieBase.hpp index 0c86a81f4..3f7014199 100644 --- a/Runtime/CPlayMovieBase.hpp +++ b/Runtime/CPlayMovieBase.hpp @@ -3,7 +3,7 @@ #include "Runtime/CIOWin.hpp" #include "Runtime/Graphics/CMoviePlayer.hpp" -namespace urde { +namespace metaforce { class CPlayMovieBase : public CIOWin { CMoviePlayer x18_moviePlayer; @@ -14,4 +14,4 @@ public: void Draw() override {} }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CPlayerState.cpp b/Runtime/CPlayerState.cpp index d2a96f7ba..6b5ee1fa0 100644 --- a/Runtime/CPlayerState.cpp +++ b/Runtime/CPlayerState.cpp @@ -14,7 +14,7 @@ #include -namespace urde { +namespace metaforce { namespace { constexpr std::array PowerUpMaxValues{ 1, 1, 1, 1, 250, 1, 1, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -450,4 +450,4 @@ CPlayerState::EItemType CPlayerState::ItemNameToType(std::string_view name) { return iter->second; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CPlayerState.hpp b/Runtime/CPlayerState.hpp index 7a040844f..e989d771f 100644 --- a/Runtime/CPlayerState.hpp +++ b/Runtime/CPlayerState.hpp @@ -9,7 +9,7 @@ #include "Runtime/rstl.hpp" #include "Runtime/World/CHealthInfo.hpp" -namespace urde { +namespace metaforce { class CPlayerState { friend class CWorldTransManager; @@ -171,4 +171,4 @@ public: bool CanTakeDamage() const { return m_canTakeDamage; } void SetCanTakeDamage(bool c) { m_canTakeDamage = c; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CRandom16.cpp b/Runtime/CRandom16.cpp index c59033224..4cf44ec54 100644 --- a/Runtime/CRandom16.cpp +++ b/Runtime/CRandom16.cpp @@ -1,6 +1,6 @@ #include "Runtime/CRandom16.hpp" -namespace urde { +namespace metaforce { CRandom16* CRandom16::g_randomNumber = nullptr; // &DefaultRandom; CGlobalRandom* CGlobalRandom::g_currentGlobalRandom = nullptr; //&DefaultGlobalRandom; @@ -11,4 +11,4 @@ u32 g_numNextCalls = 0; void CRandom16::IncrementNumNextCalls() { ++g_numNextCalls; } u32 CRandom16::GetNumNextCalls() { return g_numNextCalls; } void CRandom16::ResetNumNextCalls() { g_numNextCalls = 0; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CRandom16.hpp b/Runtime/CRandom16.hpp index 3d18ec7ea..1a8e9ff05 100644 --- a/Runtime/CRandom16.hpp +++ b/Runtime/CRandom16.hpp @@ -2,7 +2,7 @@ #include "Runtime/GCNTypes.hpp" -namespace urde { +namespace metaforce { class CRandom16 { s32 m_seed; @@ -53,4 +53,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CRelayTracker.cpp b/Runtime/CRelayTracker.cpp index 9428af090..2485bc66d 100644 --- a/Runtime/CRelayTracker.cpp +++ b/Runtime/CRelayTracker.cpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { CRelayTracker::CRelayTracker(CBitStreamReader& in, const CSaveWorld& saveWorld) { const u32 relayCount = saveWorld.GetRelayCount(); @@ -95,4 +95,4 @@ void CRelayTracker::PutTo(CBitStreamWriter& out, const CSaveWorld& saveWorld) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CRelayTracker.hpp b/Runtime/CRelayTracker.hpp index fdeb8bb0e..980a5b6a1 100644 --- a/Runtime/CRelayTracker.hpp +++ b/Runtime/CRelayTracker.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/World/ScriptObjectSupport.hpp" -namespace urde { +namespace metaforce { class CSaveWorld; class CStateManager; @@ -38,4 +38,4 @@ public: void PutTo(CBitStreamWriter& out, const CSaveWorld& saveWorld); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CResFactory.cpp b/Runtime/CResFactory.cpp index 09d178910..b976c4755 100644 --- a/Runtime/CResFactory.cpp +++ b/Runtime/CResFactory.cpp @@ -3,7 +3,7 @@ #include "Runtime/CSimplePool.hpp" #include "Runtime/CStopwatch.hpp" -namespace urde { +namespace metaforce { static logvisor::Module Log("CResFactory"); void CResFactory::AddToLoadList(SLoadingData&& data) { @@ -112,4 +112,4 @@ void CResFactory::LoadPersistentResources(CSimplePool& sp) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CResFactory.hpp b/Runtime/CResFactory.hpp index c7efaa6d1..b43731240 100644 --- a/Runtime/CResFactory.hpp +++ b/Runtime/CResFactory.hpp @@ -10,7 +10,7 @@ #include "Runtime/IFactory.hpp" #include "Runtime/IVParamObj.hpp" -namespace urde { +namespace metaforce { class IDvdRequest; class CSimplePool; @@ -53,13 +53,13 @@ public: bool CanBuild(const SObjectTag& tag) override { return x4_loader.ResourceExists(tag); } - u32 ResourceSize(const urde::SObjectTag& tag) override { return x4_loader.ResourceSize(tag); } + u32 ResourceSize(const metaforce::SObjectTag& tag) override { return x4_loader.ResourceSize(tag); } - std::unique_ptr LoadResourceSync(const urde::SObjectTag& tag) override { + std::unique_ptr LoadResourceSync(const metaforce::SObjectTag& tag) override { return x4_loader.LoadResourceSync(tag); } - std::unique_ptr LoadNewResourcePartSync(const urde::SObjectTag& tag, u32 off, u32 size) override { + std::unique_ptr LoadNewResourcePartSync(const metaforce::SObjectTag& tag, u32 off, u32 size) override { return x4_loader.LoadNewResourcePartSync(tag, off, size); } @@ -67,11 +67,11 @@ public: return x4_loader.GetTagListForFile(pakName, out); } - std::shared_ptr LoadResourceAsync(const urde::SObjectTag& tag, void* target) override { + std::shared_ptr LoadResourceAsync(const metaforce::SObjectTag& tag, void* target) override { return x4_loader.LoadResourceAsync(tag, target); } - std::shared_ptr LoadResourcePartAsync(const urde::SObjectTag& tag, u32 off, u32 size, + std::shared_ptr LoadResourcePartAsync(const metaforce::SObjectTag& tag, u32 off, u32 size, void* target) override { return x4_loader.LoadResourcePartAsync(tag, off, size, target); } @@ -101,4 +101,4 @@ public: CFactoryMgr* GetFactoryMgr() override { return &x5c_factoryMgr; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CResLoader.cpp b/Runtime/CResLoader.cpp index 43cade117..482becd53 100644 --- a/Runtime/CResLoader.cpp +++ b/Runtime/CResLoader.cpp @@ -2,7 +2,7 @@ #include "Runtime/CPakFile.hpp" -namespace urde { +namespace metaforce { static logvisor::Module Log("CResLoader"); CResLoader::CResLoader() { x48_curPak = x18_pakLoadedList.end(); } @@ -100,7 +100,7 @@ std::shared_ptr CResLoader::LoadResourceAsync(const SObjectTag& tag x50_cachedResInfo->GetOffset()); } -std::unique_ptr CResLoader::LoadResourceSync(const urde::SObjectTag& tag) { +std::unique_ptr CResLoader::LoadResourceSync(const metaforce::SObjectTag& tag) { CPakFile* file = FindResourceForLoad(tag.id); u32 size = ROUND_UP_32(x50_cachedResInfo->GetSize()); std::unique_ptr ret(new u8[size]); @@ -108,7 +108,7 @@ std::unique_ptr CResLoader::LoadResourceSync(const urde::SObjectTag& tag) return ret; } -std::unique_ptr CResLoader::LoadNewResourcePartSync(const urde::SObjectTag& tag, u32 off, u32 size) { +std::unique_ptr CResLoader::LoadNewResourcePartSync(const metaforce::SObjectTag& tag, u32 off, u32 size) { CPakFile* file = FindResourceForLoad(tag.id); std::unique_ptr ret(new u8[size]); file->SyncSeekRead(ret.get(), size, ESeekOrigin::Begin, x50_cachedResInfo->GetOffset() + off); @@ -305,4 +305,4 @@ void CResLoader::EnumerateNamedResources(const std::function LoadNewResourceSync(const SObjectTag& tag, void* extBuf = nullptr); std::shared_ptr LoadResourcePartAsync(const SObjectTag& tag, u32 off, u32 size, void* buf); std::shared_ptr LoadResourceAsync(const SObjectTag& tag, void* buf); - std::unique_ptr LoadResourceSync(const urde::SObjectTag& tag); - std::unique_ptr LoadNewResourcePartSync(const urde::SObjectTag& tag, u32 off, u32 size); + std::unique_ptr LoadResourceSync(const metaforce::SObjectTag& tag); + std::unique_ptr LoadNewResourcePartSync(const metaforce::SObjectTag& tag, u32 off, u32 size); void GetTagListForFile(const char* pakName, std::vector& out) const; bool GetResourceCompression(const SObjectTag& tag) const; u32 ResourceSize(const SObjectTag& tag) const; @@ -62,4 +62,4 @@ public: const std::list>& GetPaks() const { return x18_pakLoadedList; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CSaveWorld.cpp b/Runtime/CSaveWorld.cpp index 5f6928ac0..c1dfed047 100644 --- a/Runtime/CSaveWorld.cpp +++ b/Runtime/CSaveWorld.cpp @@ -2,7 +2,7 @@ #include "Runtime/CToken.hpp" -namespace urde { +namespace metaforce { CSaveWorld::CSaveWorld(CInputStream& in) { in.readUint32Big(); const u32 version = in.readUint32Big(); @@ -88,4 +88,4 @@ CFactoryFnReturn FSaveWorldFactory([[maybe_unused]] const SObjectTag& tag, CInpu return TToken::GetIObjObjectFor(std::make_unique(in)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CSaveWorld.hpp b/Runtime/CSaveWorld.hpp index 097ed3522..6b2d6af1c 100644 --- a/Runtime/CSaveWorld.hpp +++ b/Runtime/CSaveWorld.hpp @@ -7,7 +7,7 @@ #include "Runtime/CFactoryMgr.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CSaveWorld { public: @@ -48,4 +48,4 @@ public: CFactoryFnReturn FSaveWorldFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& param, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CScannableObjectInfo.cpp b/Runtime/CScannableObjectInfo.cpp index a4787d253..d950522fc 100644 --- a/Runtime/CScannableObjectInfo.cpp +++ b/Runtime/CScannableObjectInfo.cpp @@ -2,7 +2,7 @@ #include "Runtime/GameGlobalObjects.hpp" -namespace urde { +namespace metaforce { CScannableObjectInfo::CScannableObjectInfo(CInputStream& in, CAssetId resId) : x0_scannableObjectId(resId) { const u32 version = in.readUint32Big(); Load(in, version); @@ -69,4 +69,4 @@ CFactoryFnReturn FScannableObjectInfoFactory(const SObjectTag& tag, CInputStream CObjectReference*) { return TToken::GetIObjObjectFor(std::make_unique(in, tag.id)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CScannableObjectInfo.hpp b/Runtime/CScannableObjectInfo.hpp index 565a382f8..f844ff01e 100644 --- a/Runtime/CScannableObjectInfo.hpp +++ b/Runtime/CScannableObjectInfo.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { class CScannableObjectInfo { public: enum class EPanelType {}; @@ -45,4 +45,4 @@ public: CFactoryFnReturn FScannableObjectInfoFactory(const SObjectTag&, CInputStream&, const CVParamTransfer&, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CSimplePool.cpp b/Runtime/CSimplePool.cpp index 65dfee1a8..731059e1f 100644 --- a/Runtime/CSimplePool.cpp +++ b/Runtime/CSimplePool.cpp @@ -5,7 +5,7 @@ #include -namespace urde { +namespace metaforce { CSimplePool::CSimplePool(IFactory& factory) : x18_factory(factory), x1c_paramXfer(new TObjOwnerParam(this)) {} @@ -68,4 +68,4 @@ std::vector CSimplePool::GetReferencedTags() const { return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CSimplePool.hpp b/Runtime/CSimplePool.hpp index bc477536a..852a35b29 100644 --- a/Runtime/CSimplePool.hpp +++ b/Runtime/CSimplePool.hpp @@ -7,7 +7,7 @@ #include "Runtime/IVParamObj.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CObjectReference; class IFactory; @@ -35,4 +35,4 @@ public: size_t GetLiveObjects() const { return x8_resources.size(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CSortedLists.cpp b/Runtime/CSortedLists.cpp index 2a9ecbb99..b02ae76a0 100644 --- a/Runtime/CSortedLists.cpp +++ b/Runtime/CSortedLists.cpp @@ -5,7 +5,7 @@ #include #include -namespace urde { +namespace metaforce { namespace { template auto AccessElement(T& arr, S idx) -> typename T::reference { @@ -328,4 +328,4 @@ bool CSortedListManager::ActorInLists(const CActor* actor) const { return node.x2a_populated; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CSortedLists.hpp b/Runtime/CSortedLists.hpp index ce7d49e4a..bc47b4911 100644 --- a/Runtime/CSortedLists.hpp +++ b/Runtime/CSortedLists.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { enum class ESortedList { MinX, MinY, MinZ, MaxX, MaxY, MaxZ }; struct SSortedList { @@ -54,4 +54,4 @@ public: bool ActorInLists(const CActor* actor) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CStateManager.cpp b/Runtime/CStateManager.cpp index 182706b59..078bd517e 100644 --- a/Runtime/CStateManager.cpp +++ b/Runtime/CStateManager.cpp @@ -52,7 +52,7 @@ #include #include -namespace urde { +namespace metaforce { namespace { hecl::CVar* debugToolDrawAiPath = nullptr; hecl::CVar* debugToolDrawLighting = nullptr; @@ -61,7 +61,7 @@ hecl::CVar* debugToolDrawMazePath = nullptr; hecl::CVar* debugToolDrawPlatformCollision = nullptr; hecl::CVar* sm_logScripting = nullptr; } // namespace -logvisor::Module LogModule("urde::CStateManager"); +logvisor::Module LogModule("metaforce::CStateManager"); CStateManager::CStateManager(const std::weak_ptr& relayTracker, const std::weak_ptr& mwInfo, const std::weak_ptr& playerState, const std::weak_ptr& wtMgr, @@ -2877,4 +2877,4 @@ const CGameArea* CStateManager::GetCurrentArea() const { } return x850_world->GetAreaAlways(x850_world->GetCurrentAreaId()); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CStateManager.hpp b/Runtime/CStateManager.hpp index 953a95140..8ce3f841c 100644 --- a/Runtime/CStateManager.hpp +++ b/Runtime/CStateManager.hpp @@ -34,7 +34,7 @@ #include #include -namespace urde { +namespace metaforce { class CActor; class CActorModelParticles; class CDamageInfo; @@ -467,4 +467,4 @@ public: const CGameArea* GetCurrentArea() const; void SetWarping(bool warp) { m_warping = warp; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CStaticInterference.cpp b/Runtime/CStaticInterference.cpp index 417368733..b44d6007c 100644 --- a/Runtime/CStaticInterference.cpp +++ b/Runtime/CStaticInterference.cpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { CStaticInterference::CStaticInterference(size_t sourceCount) { x0_sources.reserve(sourceCount); } @@ -61,4 +61,4 @@ void CStaticInterference::AddSource(TUniqueId id, float magnitude, float duratio } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CStaticInterference.hpp b/Runtime/CStaticInterference.hpp index 4a9bff666..be6ceeb50 100644 --- a/Runtime/CStaticInterference.hpp +++ b/Runtime/CStaticInterference.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CStateManager; struct CStaticInterferenceSource { @@ -23,4 +23,4 @@ public: void AddSource(TUniqueId id, float magnitude, float duration); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CStopwatch.hpp b/Runtime/CStopwatch.hpp index 87397fd88..50cb9653e 100644 --- a/Runtime/CStopwatch.hpp +++ b/Runtime/CStopwatch.hpp @@ -3,7 +3,7 @@ #include #include -namespace urde { +namespace metaforce { class CStopwatch { std::chrono::steady_clock::time_point m_start; @@ -27,4 +27,4 @@ public: return t; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CStringExtras.hpp b/Runtime/CStringExtras.hpp index afa6f4505..c7acb4091 100644 --- a/Runtime/CStringExtras.hpp +++ b/Runtime/CStringExtras.hpp @@ -4,7 +4,7 @@ #include #include -namespace urde { +namespace metaforce { class CStringExtras { public: @@ -38,4 +38,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CTextureCache.cpp b/Runtime/CTextureCache.cpp index 0dda5efd8..34bc7c89a 100644 --- a/Runtime/CTextureCache.cpp +++ b/Runtime/CTextureCache.cpp @@ -1,7 +1,7 @@ #include "Runtime/CTextureCache.hpp" #include "Runtime/CToken.hpp" -namespace urde { +namespace metaforce { CTextureCache::CTextureCache(CInputStream& in) { u32 textureCount = in.readUint32Big(); for (u32 i = 0; i < textureCount; ++i) { diff --git a/Runtime/CTextureCache.hpp b/Runtime/CTextureCache.hpp index 220e0ba5c..30acaef73 100644 --- a/Runtime/CTextureCache.hpp +++ b/Runtime/CTextureCache.hpp @@ -1,7 +1,7 @@ #pragma once #include "Runtime/RetroTypes.hpp" #include "Runtime/Graphics/CTexture.hpp" -namespace urde { +namespace metaforce { class CPaletteInfo { u32 m_format; u32 m_elementCount; @@ -42,6 +42,6 @@ public: const CTextureInfo* GetTextureInfo(CAssetId id) const; }; -CFactoryFnReturn FTextureCacheFactory(const urde::SObjectTag& tag, CInputStream& in, - const urde::CVParamTransfer& vparms, CObjectReference* selfRef); +CFactoryFnReturn FTextureCacheFactory(const metaforce::SObjectTag& tag, CInputStream& in, + const metaforce::CVParamTransfer& vparms, CObjectReference* selfRef); } \ No newline at end of file diff --git a/Runtime/CTimeProvider.cpp b/Runtime/CTimeProvider.cpp index b8bceabb5..7fb723495 100644 --- a/Runtime/CTimeProvider.cpp +++ b/Runtime/CTimeProvider.cpp @@ -2,7 +2,7 @@ #include "Runtime/Graphics/CGraphics.hpp" -namespace urde { +namespace metaforce { static CTimeProvider* s_currentTimeProvider = nullptr; CTimeProvider::CTimeProvider(const float& time) : x0_currentTime(time), x8_lastProvider(s_currentTimeProvider) { @@ -23,4 +23,4 @@ CTimeProvider::~CTimeProvider() { CGraphics::SetExternalTimeProvider(s_currentTimeProvider); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CTimeProvider.hpp b/Runtime/CTimeProvider.hpp index af99cb2bf..e8fbe2cd8 100644 --- a/Runtime/CTimeProvider.hpp +++ b/Runtime/CTimeProvider.hpp @@ -1,5 +1,5 @@ #pragma once -namespace urde { +namespace metaforce { class CTimeProvider { public: const float& x0_currentTime; // in seconds @@ -9,4 +9,4 @@ public: CTimeProvider(const float& time); ~CTimeProvider(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CToken.cpp b/Runtime/CToken.cpp index 38bfa24ed..94f756b71 100644 --- a/Runtime/CToken.cpp +++ b/Runtime/CToken.cpp @@ -1,6 +1,6 @@ #include "Runtime/CToken.hpp" -namespace urde { +namespace metaforce { u16 CObjectReference::RemoveReference() { --x0_refCount; if (x0_refCount == 0) { @@ -155,4 +155,4 @@ CToken::~CToken() { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/CToken.hpp b/Runtime/CToken.hpp index fde3a4435..d56459df3 100644 --- a/Runtime/CToken.hpp +++ b/Runtime/CToken.hpp @@ -8,7 +8,7 @@ #include "Runtime/IVParamObj.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class IObjectStore; /** Shared data-structure for CToken references, analogous to std::shared_ptr */ @@ -185,4 +185,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CBallCamera.cpp b/Runtime/Camera/CBallCamera.cpp index 8a7175947..8bc5cdedd 100644 --- a/Runtime/Camera/CBallCamera.cpp +++ b/Runtime/Camera/CBallCamera.cpp @@ -20,7 +20,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { void CCameraSpring::Reset() { x4_k2Sqrt = 2.f * std::sqrt(x0_k); @@ -2320,4 +2320,4 @@ void CBallCamera::DoorClosing(TUniqueId doorId) { x18e_28_nearbyDoorClosing = true; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CBallCamera.hpp b/Runtime/Camera/CBallCamera.hpp index d7e019735..503aa5f13 100644 --- a/Runtime/Camera/CBallCamera.hpp +++ b/Runtime/Camera/CBallCamera.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CPlayer; class CCameraSpring { @@ -275,4 +275,4 @@ public: static bool IsBallNearDoor(const zeus::CVector3f& pos, CStateManager& mgr); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CCameraFilter.cpp b/Runtime/Camera/CCameraFilter.cpp index 426463ae5..f6028b113 100644 --- a/Runtime/Camera/CCameraFilter.cpp +++ b/Runtime/Camera/CCameraFilter.cpp @@ -12,7 +12,7 @@ #include #include -namespace urde { +namespace metaforce { template void CCameraFilterPass::Update(float dt) { @@ -224,4 +224,4 @@ void CCameraBlurPass::SetBlur(EBlurType type, float amount, float duration) { void CCameraBlurPass::DisableBlur(float duration) { SetBlur(EBlurType::NoBlur, 0.f, duration); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CCameraFilter.hpp b/Runtime/Camera/CCameraFilter.hpp index 44bbd88ff..686af021c 100644 --- a/Runtime/Camera/CCameraFilter.hpp +++ b/Runtime/Camera/CCameraFilter.hpp @@ -11,7 +11,7 @@ #include -namespace urde { +namespace metaforce { enum class EFilterType { Passthru, Multiply, @@ -117,4 +117,4 @@ public: EBlurType GetCurrType() const { return x10_curType; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CCameraManager.cpp b/Runtime/Camera/CCameraManager.cpp index 036c9fad6..848bee6ab 100644 --- a/Runtime/Camera/CCameraManager.cpp +++ b/Runtime/Camera/CCameraManager.cpp @@ -18,7 +18,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { float CCameraManager::sFirstPersonFOV = 55.f; CCameraManager::CCameraManager(TUniqueId curCameraId) : x0_curCameraId(curCameraId) { @@ -732,4 +732,4 @@ void CCameraManager::SetFogDensity(float fogDensityTarget, float fogDensitySpeed x9c_fogDensityFactorTarget = fogDensityTarget; x98_fogDensitySpeed = (x9c_fogDensityFactorTarget >= x94_fogDensityFactor ? fogDensitySpeed : -fogDensitySpeed); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CCameraManager.hpp b/Runtime/Camera/CCameraManager.hpp index 3c43ba103..2f0f33adc 100644 --- a/Runtime/Camera/CCameraManager.hpp +++ b/Runtime/Camera/CCameraManager.hpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { class CBallCamera; class CCameraShakeData; class CCinematicCamera; @@ -146,4 +146,4 @@ public: bool ShouldBypassInterpolation() { return false; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CCameraShakeData.cpp b/Runtime/Camera/CCameraShakeData.cpp index 490b3c9de..28a25d3ed 100644 --- a/Runtime/Camera/CCameraShakeData.cpp +++ b/Runtime/Camera/CCameraShakeData.cpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { SCameraShakePoint SCameraShakePoint::LoadCameraShakePoint(CInputStream& in) { u32 useEnvelope = ScriptLoader::LoadParameterFlags(in); @@ -136,4 +136,4 @@ const CCameraShakeData CCameraShakeData::skChargedShotCameraShakeData{ CCameraShakerComponent{}, }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CCameraShakeData.hpp b/Runtime/Camera/CCameraShakeData.hpp index 7e9ebd2e8..b1a4de181 100644 --- a/Runtime/Camera/CCameraShakeData.hpp +++ b/Runtime/Camera/CCameraShakeData.hpp @@ -4,7 +4,7 @@ #include -namespace urde { +namespace metaforce { class CRandom16; class CStateManager; @@ -179,4 +179,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CCameraSpline.cpp b/Runtime/Camera/CCameraSpline.cpp index 6111225ee..b7cf42b7e 100644 --- a/Runtime/Camera/CCameraSpline.cpp +++ b/Runtime/Camera/CCameraSpline.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CCameraSpline::CCameraSpline(bool closedLoop) : x48_closedLoop(closedLoop) {} void CCameraSpline::CalculateKnots(TUniqueId cameraId, const std::vector& connections, @@ -395,4 +395,4 @@ float CCameraSpline::ClampLength(const zeus::CVector3f& pos, bool collide, const return x44_length; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CCameraSpline.hpp b/Runtime/Camera/CCameraSpline.hpp index 7dd48aece..576339bff 100644 --- a/Runtime/Camera/CCameraSpline.hpp +++ b/Runtime/Camera/CCameraSpline.hpp @@ -3,7 +3,7 @@ #include "World/CEntityInfo.hpp" #include "zeus/CVector3f.hpp" -namespace urde { +namespace metaforce { class CStateManager; class CMaterialFilter; @@ -40,4 +40,4 @@ public: bool IsClosedLoop() const { return x48_closedLoop; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CCinematicCamera.cpp b/Runtime/Camera/CCinematicCamera.cpp index 61a9427b1..875e67057 100644 --- a/Runtime/Camera/CCinematicCamera.cpp +++ b/Runtime/Camera/CCinematicCamera.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CCinematicCamera::CCinematicCamera(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active, float shotDuration, float fovy, float znear, @@ -454,4 +454,4 @@ void CCinematicCamera::CalculateWaypoints(CStateManager& mgr) { void CCinematicCamera::SendArrivedMsg(TUniqueId reciever, CStateManager& mgr) { mgr.SendScriptMsgAlways(reciever, GetUniqueId(), EScriptObjectMessage::Arrived); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CCinematicCamera.hpp b/Runtime/Camera/CCinematicCamera.hpp index 9a4fcac8e..0f8646b9c 100644 --- a/Runtime/Camera/CCinematicCamera.hpp +++ b/Runtime/Camera/CCinematicCamera.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CCinematicCamera : public CGameCamera { std::vector x188_viewPoints; @@ -56,4 +56,4 @@ public: float GetDuration() const { return x1e8_duration; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CFirstPersonCamera.cpp b/Runtime/Camera/CFirstPersonCamera.cpp index d8aabbd2b..70eec0884 100644 --- a/Runtime/Camera/CFirstPersonCamera.cpp +++ b/Runtime/Camera/CFirstPersonCamera.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CFirstPersonCamera::CFirstPersonCamera(TUniqueId uid, const zeus::CTransform& xf, TUniqueId watchedObj, float orbitCameraSpeed, float fov, float nearz, float farz, float aspect) @@ -333,4 +333,4 @@ void CFirstPersonCamera::_fovListener(hecl::CVar* cv) { x170_24_perspDirty = true; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CFirstPersonCamera.hpp b/Runtime/Camera/CFirstPersonCamera.hpp index 01ed95497..55ab79373 100644 --- a/Runtime/Camera/CFirstPersonCamera.hpp +++ b/Runtime/Camera/CFirstPersonCamera.hpp @@ -6,7 +6,7 @@ #include #include -namespace urde { +namespace metaforce { class CFirstPersonCamera : public CGameCamera { float x188_orbitCameraSpeed; @@ -37,4 +37,4 @@ public: void SetLockCamera(bool v) { x18c_lockCamera = v; } void DeferBallTransitionProcessing() { x1c6_24_deferBallTransitionProcessing = true; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CGameCamera.cpp b/Runtime/Camera/CGameCamera.cpp index dc3508d8f..d86d7c825 100644 --- a/Runtime/Camera/CGameCamera.cpp +++ b/Runtime/Camera/CGameCamera.cpp @@ -4,7 +4,7 @@ #include "Runtime/Camera/CCameraManager.hpp" #include "Runtime/World/CActorParameters.hpp" -namespace urde { +namespace metaforce { CGameCamera::CGameCamera(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, float fovy, float znear, float zfar, float aspect, @@ -134,4 +134,4 @@ void CGameCamera::SkipFovInterpolation() { x178_perspInterpRemTime = x174_delayTime = 0.f; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CGameCamera.hpp b/Runtime/Camera/CGameCamera.hpp index c0d33805e..5152252ff 100644 --- a/Runtime/Camera/CGameCamera.hpp +++ b/Runtime/Camera/CGameCamera.hpp @@ -6,7 +6,7 @@ #include #include -namespace urde { +namespace metaforce { struct CFinalInput; class CGameCamera : public CActor { @@ -54,4 +54,4 @@ public: void SetFovInterpolation(float start, float end, float time, float delayTime); void SkipFovInterpolation(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CInterpolationCamera.cpp b/Runtime/Camera/CInterpolationCamera.cpp index 56c37d097..7120dc040 100644 --- a/Runtime/Camera/CInterpolationCamera.cpp +++ b/Runtime/Camera/CInterpolationCamera.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CInterpolationCamera::CInterpolationCamera(TUniqueId uid, const zeus::CTransform& xf) : CGameCamera(uid, false, "Interpolation Camera", @@ -205,4 +205,4 @@ bool CInterpolationCamera::InterpolateWithDistance(zeus::CTransform& xf, const z return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CInterpolationCamera.hpp b/Runtime/Camera/CInterpolationCamera.hpp index b34cde012..549fefa5c 100644 --- a/Runtime/Camera/CInterpolationCamera.hpp +++ b/Runtime/Camera/CInterpolationCamera.hpp @@ -5,7 +5,7 @@ #include #include -namespace urde { +namespace metaforce { class CInterpolationCamera : public CGameCamera { TUniqueId x188_targetId = kInvalidUniqueId; @@ -38,4 +38,4 @@ public: void DeactivateInterpCamera(CStateManager&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CPathCamera.cpp b/Runtime/Camera/CPathCamera.cpp index ea39057ae..abb8ab5c0 100644 --- a/Runtime/Camera/CPathCamera.cpp +++ b/Runtime/Camera/CPathCamera.cpp @@ -10,7 +10,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CPathCamera::CPathCamera(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active, float lengthExtent, float filterMag, float filterProportion, float minEaseDist, @@ -211,4 +211,4 @@ void CPathCamera::ClampToClosedDoor(CStateManager& mgr) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Camera/CPathCamera.hpp b/Runtime/Camera/CPathCamera.hpp index 7757e76a1..31df65fec 100644 --- a/Runtime/Camera/CPathCamera.hpp +++ b/Runtime/Camera/CPathCamera.hpp @@ -3,7 +3,7 @@ #include "Runtime/Camera/CCameraSpline.hpp" #include "Runtime/Camera/CGameCamera.hpp" -namespace urde { +namespace metaforce { class CPathCamera : public CGameCamera { public: @@ -36,4 +36,4 @@ public: void ClampToClosedDoor(CStateManager&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CActorLights.cpp b/Runtime/Character/CActorLights.cpp index 70530aebf..f68695e80 100644 --- a/Runtime/Character/CActorLights.cpp +++ b/Runtime/Character/CActorLights.cpp @@ -12,7 +12,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { s32 CActorLights::sFrameSchedulerCount = 0; CActorLights::CActorLights(u32 areaUpdateFramePeriod, const zeus::CVector3f& actorPosBias, int maxDynamicLights, @@ -505,4 +505,4 @@ u32 CActorLights::GetActiveLightCount() const { return x144_dynamicLights.size(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CActorLights.hpp b/Runtime/Character/CActorLights.hpp index 6c437a2ed..c1c8de5fc 100644 --- a/Runtime/Character/CActorLights.hpp +++ b/Runtime/Character/CActorLights.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CBooModel; class CGameArea; class CStateManager; @@ -91,4 +91,4 @@ public: void SetActorPositionBias(const zeus::CVector3f& bias) { x2ac_actorPosBias = bias; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAdditiveAnimPlayback.cpp b/Runtime/Character/CAdditiveAnimPlayback.cpp index fde744ded..37ab95148 100644 --- a/Runtime/Character/CAdditiveAnimPlayback.cpp +++ b/Runtime/Character/CAdditiveAnimPlayback.cpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CCharLayoutInfo.hpp" #include "Runtime/Character/CSegStatementSet.hpp" -namespace urde { +namespace metaforce { CAdditiveAnimPlayback::CAdditiveAnimPlayback(const std::weak_ptr& anim, float weight, bool active, const CAdditiveAnimationInfo& info, bool fadeOut) @@ -101,4 +101,4 @@ void CAdditiveAnimPlayback::SetWeight(float w) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAdditiveAnimPlayback.hpp b/Runtime/Character/CAdditiveAnimPlayback.hpp index 637a287d8..c85ac976d 100644 --- a/Runtime/Character/CAdditiveAnimPlayback.hpp +++ b/Runtime/Character/CAdditiveAnimPlayback.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CAdditiveAnimationInfo; class CAnimTreeNode; class CCharLayoutInfo; @@ -55,4 +55,4 @@ public: bool NeedsFadeOut() const { return x20_needsFadeOut; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAdditiveBodyState.cpp b/Runtime/Character/CAdditiveBodyState.cpp index a5bd39850..fefb2a9b7 100644 --- a/Runtime/Character/CAdditiveBodyState.cpp +++ b/Runtime/Character/CAdditiveBodyState.cpp @@ -6,7 +6,7 @@ #include "Runtime/Character/CPASDatabase.hpp" #include "Runtime/Character/CPASAnimParmData.hpp" -namespace urde { +namespace metaforce { void CABSAim::Start(CBodyController& bc, CStateManager& mgr) { // const CBCAdditiveAimCmd* cmd = @@ -197,4 +197,4 @@ void CABSReaction::StopAnimation(CBodyController& bc) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAdditiveBodyState.hpp b/Runtime/Character/CAdditiveBodyState.hpp index 3c2c3bbb6..8330e0d0f 100644 --- a/Runtime/Character/CAdditiveBodyState.hpp +++ b/Runtime/Character/CAdditiveBodyState.hpp @@ -6,7 +6,7 @@ #include "Runtime/Character/CBodyStateCmdMgr.hpp" #include "Runtime/Character/CharacterCommon.hpp" -namespace urde { +namespace metaforce { class CActor; class CBodyController; class CStateManager; @@ -71,4 +71,4 @@ public: void Shutdown(CBodyController& bc) override { StopAnimation(bc); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAllFormatsAnimSource.cpp b/Runtime/Character/CAllFormatsAnimSource.cpp index 025eed532..7e852ede9 100644 --- a/Runtime/Character/CAllFormatsAnimSource.cpp +++ b/Runtime/Character/CAllFormatsAnimSource.cpp @@ -6,8 +6,8 @@ #include -namespace urde { -static logvisor::Module Log("urde::CAllFormatsAnimSource"); +namespace metaforce { +static logvisor::Module Log("metaforce::CAllFormatsAnimSource"); void CAnimFormatUnion::SubConstruct(u8* storage, EAnimFormat fmt, CInputStream& in, IObjectStore& store) { switch (fmt) { @@ -67,4 +67,4 @@ CFactoryFnReturn AnimSourceFactory(const SObjectTag& tag, CInputStream& in, cons return TToken::GetIObjObjectFor(std::make_unique(in, *sp, tag)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAllFormatsAnimSource.hpp b/Runtime/Character/CAllFormatsAnimSource.hpp index b8a60f9e8..1388c2583 100644 --- a/Runtime/Character/CAllFormatsAnimSource.hpp +++ b/Runtime/Character/CAllFormatsAnimSource.hpp @@ -10,7 +10,7 @@ #include -namespace urde { +namespace metaforce { class IAnimReader; class IObjectStore; @@ -48,4 +48,4 @@ public: CFactoryFnReturn AnimSourceFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& params, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimCharacterSet.cpp b/Runtime/Character/CAnimCharacterSet.cpp index 15a7a7943..a85150f8f 100644 --- a/Runtime/Character/CAnimCharacterSet.cpp +++ b/Runtime/Character/CAnimCharacterSet.cpp @@ -2,7 +2,7 @@ #include "Runtime/CToken.hpp" -namespace urde { +namespace metaforce { CAnimCharacterSet::CAnimCharacterSet(CInputStream& in) : x0_version(in.readUint16Big()), x4_characterSet(in), x1c_animationSet(in) {} @@ -12,4 +12,4 @@ CFactoryFnReturn FAnimCharacterSet(const SObjectTag&, CInputStream& in, const CV return TToken::GetIObjObjectFor(std::make_unique(in)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimCharacterSet.hpp b/Runtime/Character/CAnimCharacterSet.hpp index 94bba47cf..24795ed91 100644 --- a/Runtime/Character/CAnimCharacterSet.hpp +++ b/Runtime/Character/CAnimCharacterSet.hpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CAnimationSet.hpp" #include "Runtime/Character/CCharacterSet.hpp" -namespace urde { +namespace metaforce { class CAnimCharacterSet { u16 x0_version; @@ -19,4 +19,4 @@ public: CFactoryFnReturn FAnimCharacterSet(const SObjectTag&, CInputStream&, const CVParamTransfer&, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimData.cpp b/Runtime/Character/CAnimData.cpp index ebbba498e..f1eaf9548 100644 --- a/Runtime/Character/CAnimData.cpp +++ b/Runtime/Character/CAnimData.cpp @@ -26,7 +26,7 @@ #include -namespace urde { +namespace metaforce { static logvisor::Module Log("CAnimData"); rstl::reserved_vector CAnimData::g_BoolPOINodes; @@ -894,4 +894,4 @@ void CAnimData::SetParticleCEXTValue(std::string_view name, int idx, float value x120_particleDB.SetCEXTValue(search->second.front().GetComponentName(), idx, value); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimData.hpp b/Runtime/Character/CAnimData.hpp index 62905ca84..71edfaaed 100644 --- a/Runtime/Character/CAnimData.hpp +++ b/Runtime/Character/CAnimData.hpp @@ -60,7 +60,7 @@ enum class EUserEventType { EffectOff = 34 }; -namespace urde { +namespace metaforce { class CAnimTreeNode; class CAnimationManager; class CBoolPOINode; @@ -252,4 +252,4 @@ public: void MarkPoseDirty() { x220_30_poseBuilt = false; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimPOIData.cpp b/Runtime/Character/CAnimPOIData.cpp index 54014bf3e..0f9328307 100644 --- a/Runtime/Character/CAnimPOIData.cpp +++ b/Runtime/Character/CAnimPOIData.cpp @@ -2,7 +2,7 @@ #include "Runtime/CToken.hpp" -namespace urde { +namespace metaforce { CAnimPOIData::CAnimPOIData(CInputStream& in) : x0_version(in.readUint32Big()) { u32 boolCount = in.readUint32Big(); @@ -33,4 +33,4 @@ CFactoryFnReturn AnimPOIDataFactory(const SObjectTag& tag, CInputStream& in, con return TToken::GetIObjObjectFor(std::make_unique(in)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimPOIData.hpp b/Runtime/Character/CAnimPOIData.hpp index 577bc688c..d51acde57 100644 --- a/Runtime/Character/CAnimPOIData.hpp +++ b/Runtime/Character/CAnimPOIData.hpp @@ -9,7 +9,7 @@ #include "Runtime/Character/CParticlePOINode.hpp" #include "Runtime/Character/CSoundPOINode.hpp" -namespace urde { +namespace metaforce { class CAnimPOIData { u32 x0_version; @@ -30,4 +30,4 @@ public: CFactoryFnReturn AnimPOIDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& parms, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimPerSegmentData.hpp b/Runtime/Character/CAnimPerSegmentData.hpp index e9f252eef..7b74c7a46 100644 --- a/Runtime/Character/CAnimPerSegmentData.hpp +++ b/Runtime/Character/CAnimPerSegmentData.hpp @@ -3,7 +3,7 @@ #include #include -namespace urde { +namespace metaforce { struct CAnimPerSegmentData { zeus::CQuaternion x0_rotation; @@ -11,4 +11,4 @@ struct CAnimPerSegmentData { bool x1c_hasOffset = false; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimPlaybackParms.hpp b/Runtime/Character/CAnimPlaybackParms.hpp index 0515185d1..c1979c067 100644 --- a/Runtime/Character/CAnimPlaybackParms.hpp +++ b/Runtime/Character/CAnimPlaybackParms.hpp @@ -6,7 +6,7 @@ #include #include -namespace urde { +namespace metaforce { class CAnimPlaybackParms { s32 x0_animA = -1; s32 x4_animB = -1; @@ -45,4 +45,4 @@ public: constexpr void SetBlendFactor(float f) { x8_blendWeight = f; } constexpr bool GetIsPlayAnimation() const { return xc_animating; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimSource.cpp b/Runtime/Character/CAnimSource.cpp index 6d884c56c..7ab35115e 100644 --- a/Runtime/Character/CAnimSource.cpp +++ b/Runtime/Character/CAnimSource.cpp @@ -7,7 +7,7 @@ #include "Runtime/Character/CSegIdList.hpp" #include "Runtime/Character/CSegStatementSet.hpp" -namespace urde { +namespace metaforce { static constexpr float ClampZeroToOne(float in) { return std::clamp(in, 0.0f, 1.0f); } @@ -215,4 +215,4 @@ bool CAnimSource::HasOffset(const CSegId& seg) const { return transIdx != 0xff; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimSource.hpp b/Runtime/Character/CAnimSource.hpp index 26dc312cb..4f554e06b 100644 --- a/Runtime/Character/CAnimSource.hpp +++ b/Runtime/Character/CAnimSource.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CAnimPOIData; class CBoolPOINode; class CInt32POINode; @@ -78,4 +78,4 @@ public: const CSegId& GetRootBoneId() const { return x1c_rootBone; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimSourceReader.cpp b/Runtime/Character/CAnimSourceReader.cpp index c4effdb7c..fd27d6686 100644 --- a/Runtime/Character/CAnimSourceReader.cpp +++ b/Runtime/Character/CAnimSourceReader.cpp @@ -8,7 +8,7 @@ #include "Runtime/Character/CParticlePOINode.hpp" #include "Runtime/Character/CSoundPOINode.hpp" -namespace urde { +namespace metaforce { CAnimSourceInfo::CAnimSourceInfo(TSubAnimTypeToken token) : x4_token(std::move(token)) {} @@ -381,4 +381,4 @@ CAnimSourceReader::CAnimSourceReader(const CAnimSourceReader& other) , x54_source(other.x54_source) , x64_steadyStateInfo(other.x64_steadyStateInfo) {} -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimSourceReader.hpp b/Runtime/Character/CAnimSourceReader.hpp index 8509d1885..d955f7070 100644 --- a/Runtime/Character/CAnimSourceReader.hpp +++ b/Runtime/Character/CAnimSourceReader.hpp @@ -11,7 +11,7 @@ #include "Runtime/Character/CParticleData.hpp" #include "Runtime/Character/IAnimReader.hpp" -namespace urde { +namespace metaforce { class IAnimSourceInfo { public: @@ -104,4 +104,4 @@ public: zeus::CQuaternion VGetRotation(const CSegId& seg) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimSysContext.hpp b/Runtime/Character/CAnimSysContext.hpp index 4a75b23ba..30f1fa8f5 100644 --- a/Runtime/Character/CAnimSysContext.hpp +++ b/Runtime/Character/CAnimSysContext.hpp @@ -7,7 +7,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/Character/CTransitionDatabaseGame.hpp" -namespace urde { +namespace metaforce { class CSimplePool; struct CAnimSysContext { @@ -19,4 +19,4 @@ struct CAnimSysContext { : x0_transDB(std::move(transDB)), x8_random(std::make_shared(randomSeed)), xc_store(store) {} }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeAnimReaderContainer.cpp b/Runtime/Character/CAnimTreeAnimReaderContainer.cpp index 325205bb6..50d5d3fcb 100644 --- a/Runtime/Character/CAnimTreeAnimReaderContainer.cpp +++ b/Runtime/Character/CAnimTreeAnimReaderContainer.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CFBStreamedAnimReader.hpp" -namespace urde { +namespace metaforce { CAnimTreeAnimReaderContainer::CAnimTreeAnimReaderContainer(std::string_view name, std::shared_ptr reader, u32 dbIdx) @@ -97,4 +97,4 @@ void CAnimTreeAnimReaderContainer::VGetWeightedReaders( out.emplace_back(std::make_pair(w, x14_reader)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeAnimReaderContainer.hpp b/Runtime/Character/CAnimTreeAnimReaderContainer.hpp index 44d55afe0..4642eddf2 100644 --- a/Runtime/Character/CAnimTreeAnimReaderContainer.hpp +++ b/Runtime/Character/CAnimTreeAnimReaderContainer.hpp @@ -8,7 +8,7 @@ #include "Runtime/rstl.hpp" #include "Runtime/Character/CAnimTreeNode.hpp" -namespace urde { +namespace metaforce { class CAnimTreeAnimReaderContainer : public CAnimTreeNode { std::shared_ptr x14_reader; @@ -48,4 +48,4 @@ public: SAdvancementResults VGetAdvancementResults(const CCharAnimTime& a, const CCharAnimTime& b) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeBlend.cpp b/Runtime/Character/CAnimTreeBlend.cpp index 8dbabbd8d..af05e6ac9 100644 --- a/Runtime/Character/CAnimTreeBlend.cpp +++ b/Runtime/Character/CAnimTreeBlend.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CAnimTreeBlend.hpp" -namespace urde { +namespace metaforce { std::string CAnimTreeBlend::CreatePrimitiveName(const std::shared_ptr& a, const std::shared_ptr& b, float scale) { @@ -63,4 +63,4 @@ void CAnimTreeBlend::SetBlendingWeight(float w) { x24_blendWeight = w; } float CAnimTreeBlend::VGetBlendingWeight() const { return x24_blendWeight; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeBlend.hpp b/Runtime/Character/CAnimTreeBlend.hpp index 5717c6e30..6030247f5 100644 --- a/Runtime/Character/CAnimTreeBlend.hpp +++ b/Runtime/Character/CAnimTreeBlend.hpp @@ -5,7 +5,7 @@ #include "Runtime/Character/CAnimTreeTweenBase.hpp" -namespace urde { +namespace metaforce { class CAnimTreeBlend : public CAnimTreeTweenBase { float x24_blendWeight; @@ -25,4 +25,4 @@ public: float VGetBlendingWeight() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeDoubleChild.cpp b/Runtime/Character/CAnimTreeDoubleChild.cpp index 2a9d251c0..42d775db1 100644 --- a/Runtime/Character/CAnimTreeDoubleChild.cpp +++ b/Runtime/Character/CAnimTreeDoubleChild.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CAnimTreeDoubleChild.hpp" -namespace urde { +namespace metaforce { CAnimTreeDoubleChild::CAnimTreeDoubleChild(const std::weak_ptr& a, const std::weak_ptr& b, std::string_view name) @@ -157,4 +157,4 @@ void CAnimTreeDoubleChild::VGetWeightedReaders( x18_b->VGetWeightedReaders(out, w); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeDoubleChild.hpp b/Runtime/Character/CAnimTreeDoubleChild.hpp index 22ddbbb2b..b94dae770 100644 --- a/Runtime/Character/CAnimTreeDoubleChild.hpp +++ b/Runtime/Character/CAnimTreeDoubleChild.hpp @@ -6,7 +6,7 @@ #include "Runtime/rstl.hpp" #include "Runtime/Character/CAnimTreeNode.hpp" -namespace urde { +namespace metaforce { class CAnimTreeDoubleChild : public CAnimTreeNode { public: @@ -59,4 +59,4 @@ public: const std::shared_ptr& GetLeftChild() const { return x14_a; } const std::shared_ptr& GetRightChild() const { return x18_b; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeLoopIn.cpp b/Runtime/Character/CAnimTreeLoopIn.cpp index b3c655cbb..c53a54884 100644 --- a/Runtime/Character/CAnimTreeLoopIn.cpp +++ b/Runtime/Character/CAnimTreeLoopIn.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CTreeUtils.hpp" -namespace urde { +namespace metaforce { std::string CAnimTreeLoopIn::CreatePrimitiveName(const std::weak_ptr& a, const std::weak_ptr& b, @@ -101,4 +101,4 @@ SAdvancementResults CAnimTreeLoopIn::VAdvanceView(const CCharAnimTime& dt) { return res; } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/Character/CAnimTreeLoopIn.hpp b/Runtime/Character/CAnimTreeLoopIn.hpp index f1c30730a..82ff6b39f 100644 --- a/Runtime/Character/CAnimTreeLoopIn.hpp +++ b/Runtime/Character/CAnimTreeLoopIn.hpp @@ -8,7 +8,7 @@ #include "Runtime/Character/CAnimTreeSingleChild.hpp" #include "Runtime/Character/CSequenceHelper.hpp" -namespace urde { +namespace metaforce { class CAnimTreeLoopIn : public CAnimTreeSingleChild { std::shared_ptr x18_nextAnim; @@ -42,4 +42,4 @@ public: SAdvancementResults VAdvanceView(const CCharAnimTime& dt) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeNode.cpp b/Runtime/Character/CAnimTreeNode.cpp index efbad4e5d..b73cd30bd 100644 --- a/Runtime/Character/CAnimTreeNode.cpp +++ b/Runtime/Character/CAnimTreeNode.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CAnimTreeNode.hpp" -namespace urde { +namespace metaforce { CAnimTreeEffectiveContribution CAnimTreeNode::GetContributionOfHighestInfluence() const { return VGetContributionOfHighestInfluence(); @@ -10,4 +10,4 @@ u32 CAnimTreeNode::GetNumChildren() const { return VGetNumChildren(); } std::shared_ptr CAnimTreeNode::GetBestUnblendedChild() const { return VGetBestUnblendedChild(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeNode.hpp b/Runtime/Character/CAnimTreeNode.hpp index d18b94eb9..3071722a0 100644 --- a/Runtime/Character/CAnimTreeNode.hpp +++ b/Runtime/Character/CAnimTreeNode.hpp @@ -7,7 +7,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/Character/IAnimReader.hpp" -namespace urde { +namespace metaforce { class CAnimTreeNode : public IAnimReader { protected: @@ -39,4 +39,4 @@ public: std::string_view GetName() const { return x4_name; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeSequence.cpp b/Runtime/Character/CAnimTreeSequence.cpp index fadc46b5e..a964abc07 100644 --- a/Runtime/Character/CAnimTreeSequence.cpp +++ b/Runtime/Character/CAnimTreeSequence.cpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CTreeUtils.hpp" #include "Runtime/Character/IMetaAnim.hpp" -namespace urde { +namespace metaforce { CAnimTreeSequence::CAnimTreeSequence(std::vector> seq, CAnimSysContext animSys, std::string_view name) @@ -121,4 +121,4 @@ std::unique_ptr CAnimTreeSequence::VClone() const { x18_animCtx, x4_name, x3c_fundamentals, x94_curTime); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeSequence.hpp b/Runtime/Character/CAnimTreeSequence.hpp index 56e038097..f8a3c5ac6 100644 --- a/Runtime/Character/CAnimTreeSequence.hpp +++ b/Runtime/Character/CAnimTreeSequence.hpp @@ -8,7 +8,7 @@ #include "Runtime/Character/CAnimTreeSingleChild.hpp" #include "Runtime/Character/CSequenceHelper.hpp" -namespace urde { +namespace metaforce { class IMetaAnim; class CTransitionDatabaseGame; @@ -42,4 +42,4 @@ public: std::unique_ptr VClone() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeSingleChild.cpp b/Runtime/Character/CAnimTreeSingleChild.cpp index 0100c0797..2bc59a3d3 100644 --- a/Runtime/Character/CAnimTreeSingleChild.cpp +++ b/Runtime/Character/CAnimTreeSingleChild.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CAnimTreeSingleChild.hpp" -namespace urde { +namespace metaforce { CAnimTreeSingleChild::CAnimTreeSingleChild(const std::weak_ptr& node, std::string_view name) : CAnimTreeNode(name), x14_child(node.lock()) {} @@ -62,4 +62,4 @@ u32 CAnimTreeSingleChild::Depth() const { return x14_child->Depth() + 1; } u32 CAnimTreeSingleChild::VGetNumChildren() const { return x14_child->VGetNumChildren() + 1; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeSingleChild.hpp b/Runtime/Character/CAnimTreeSingleChild.hpp index 9ed59f795..676865db2 100644 --- a/Runtime/Character/CAnimTreeSingleChild.hpp +++ b/Runtime/Character/CAnimTreeSingleChild.hpp @@ -6,7 +6,7 @@ #include "Runtime/rstl.hpp" #include "Runtime/Character/CAnimTreeNode.hpp" -namespace urde { +namespace metaforce { class CAnimTreeSingleChild : public CAnimTreeNode { protected: @@ -42,4 +42,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeTimeScale.cpp b/Runtime/Character/CAnimTreeTimeScale.cpp index a7c2ecba1..5403d8909 100644 --- a/Runtime/Character/CAnimTreeTimeScale.cpp +++ b/Runtime/Character/CAnimTreeTimeScale.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CAnimTreeTimeScale.hpp" -namespace urde { +namespace metaforce { CAnimTreeTimeScale::CAnimTreeTimeScale(const std::weak_ptr& node, float scale, std::string_view name) : CAnimTreeSingleChild(node, name) @@ -197,4 +197,4 @@ SAdvancementResults CAnimTreeTimeScale::VAdvanceView(const CCharAnimTime& dt) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeTimeScale.hpp b/Runtime/Character/CAnimTreeTimeScale.hpp index f591e10a6..8ef1af663 100644 --- a/Runtime/Character/CAnimTreeTimeScale.hpp +++ b/Runtime/Character/CAnimTreeTimeScale.hpp @@ -8,7 +8,7 @@ #include "Runtime/Character/CAnimTreeSingleChild.hpp" #include "Runtime/Character/CTimeScaleFunctions.hpp" -namespace urde { +namespace metaforce { class CAnimTreeTimeScale : public CAnimTreeSingleChild { std::unique_ptr x18_timeScale; @@ -46,4 +46,4 @@ public: SAdvancementResults VAdvanceView(const CCharAnimTime& dt) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeTransition.cpp b/Runtime/Character/CAnimTreeTransition.cpp index 5d5c107c2..4928c4180 100644 --- a/Runtime/Character/CAnimTreeTransition.cpp +++ b/Runtime/Character/CAnimTreeTransition.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CAnimTreeTransition.hpp" -namespace urde { +namespace metaforce { std::string CAnimTreeTransition::CreatePrimitiveName(const std::weak_ptr&, const std::weak_ptr&, float) { @@ -140,4 +140,4 @@ float CAnimTreeTransition::VGetBlendingWeight() const { return x2c_timeInTrans.GetSeconds() / x24_transDur.GetSeconds(); return 0.f; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeTransition.hpp b/Runtime/Character/CAnimTreeTransition.hpp index 86ba96ec9..e856422ab 100644 --- a/Runtime/Character/CAnimTreeTransition.hpp +++ b/Runtime/Character/CAnimTreeTransition.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Character/CAnimTreeTweenBase.hpp" -namespace urde { +namespace metaforce { class CAnimTreeTransition : public CAnimTreeTweenBase { protected: @@ -36,4 +36,4 @@ public: void SetBlendingWeight(float w) override; float VGetBlendingWeight() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeTweenBase.cpp b/Runtime/Character/CAnimTreeTweenBase.cpp index 8452c06d2..784ee1a8d 100644 --- a/Runtime/Character/CAnimTreeTweenBase.cpp +++ b/Runtime/Character/CAnimTreeTweenBase.cpp @@ -3,7 +3,7 @@ #include "Runtime/Character/CSegIdList.hpp" #include "Runtime/Character/CSegStatementSet.hpp" -namespace urde { +namespace metaforce { s32 CAnimTreeTweenBase::sAdvancementDepth = 0; @@ -124,4 +124,4 @@ std::optional> CAnimTreeTweenBase::VSimplified() { return {tmpUnblended->Clone()}; } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimTreeTweenBase.hpp b/Runtime/Character/CAnimTreeTweenBase.hpp index e0f41a4dc..6880b4e99 100644 --- a/Runtime/Character/CAnimTreeTweenBase.hpp +++ b/Runtime/Character/CAnimTreeTweenBase.hpp @@ -6,7 +6,7 @@ #include "Runtime/rstl.hpp" #include "Runtime/Character/CAnimTreeDoubleChild.hpp" -namespace urde { +namespace metaforce { class CAnimTreeTweenBase : public CAnimTreeDoubleChild { static s32 sAdvancementDepth; @@ -45,4 +45,4 @@ public: static void DecAdvancementDepth() { sAdvancementDepth--; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimation.cpp b/Runtime/Character/CAnimation.cpp index cbb27be3d..d7de743bb 100644 --- a/Runtime/Character/CAnimation.cpp +++ b/Runtime/Character/CAnimation.cpp @@ -2,11 +2,11 @@ #include "Runtime/Character/CMetaAnimFactory.hpp" -namespace urde { +namespace metaforce { CAnimation::CAnimation(CInputStream& in) { x0_name = in.readString(); x10_anim = CMetaAnimFactory::CreateMetaAnim(in); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimation.hpp b/Runtime/Character/CAnimation.hpp index be592bbb4..696d7e1cb 100644 --- a/Runtime/Character/CAnimation.hpp +++ b/Runtime/Character/CAnimation.hpp @@ -6,7 +6,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/CMetaAnimFactory.hpp" -namespace urde { +namespace metaforce { class IMetaAnim; class CAnimation { @@ -19,4 +19,4 @@ public: std::string_view GetMetaAnimName() const { return x0_name; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimationDatabase.hpp b/Runtime/Character/CAnimationDatabase.hpp index 93f4c19e2..53ebcea78 100644 --- a/Runtime/Character/CAnimationDatabase.hpp +++ b/Runtime/Character/CAnimationDatabase.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CPrimitive; class IMetaAnim; @@ -20,4 +20,4 @@ public: virtual void GetUniquePrimitivesFromMetaAnim(std::set&, std::string_view) const = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimationDatabaseGame.cpp b/Runtime/Character/CAnimationDatabaseGame.cpp index 764fee1b4..8963a11bb 100644 --- a/Runtime/Character/CAnimationDatabaseGame.cpp +++ b/Runtime/Character/CAnimationDatabaseGame.cpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CPrimitive.hpp" #include "Runtime/Character/IMetaAnim.hpp" -namespace urde { +namespace metaforce { CAnimationDatabaseGame::CAnimationDatabaseGame(const std::vector& anims) { x10_anims.reserve(anims.size()); @@ -34,4 +34,4 @@ void CAnimationDatabaseGame::GetUniquePrimitivesFromMetaAnim(std::set& primsOut, std::string_view name) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimationManager.cpp b/Runtime/Character/CAnimationManager.cpp index d7c69634b..062603a40 100644 --- a/Runtime/Character/CAnimationManager.cpp +++ b/Runtime/Character/CAnimationManager.cpp @@ -3,7 +3,7 @@ #include "Runtime/Character/CAnimationDatabaseGame.hpp" #include "Runtime/Character/IMetaAnim.hpp" -namespace urde { +namespace metaforce { const CAnimationDatabaseGame* CAnimationManager::GetAnimationDatabase() const { return x0_animDB.GetObj(); } @@ -17,4 +17,4 @@ const std::shared_ptr& CAnimationManager::GetMetaAnimation(s32 idx) c return x0_animDB->GetMetaAnim(idx); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimationManager.hpp b/Runtime/Character/CAnimationManager.hpp index 26956ed29..dba0e24c2 100644 --- a/Runtime/Character/CAnimationManager.hpp +++ b/Runtime/Character/CAnimationManager.hpp @@ -6,7 +6,7 @@ #include "Runtime/Character/CAnimationDatabaseGame.hpp" #include "Runtime/Character/CAnimSysContext.hpp" -namespace urde { +namespace metaforce { class CAnimTreeNode; class CSimplePool; class IMetaAnim; @@ -26,4 +26,4 @@ public: const std::shared_ptr& GetMetaAnimation(s32) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimationSet.cpp b/Runtime/Character/CAnimationSet.cpp index a3ae93fe8..690b1a3c7 100644 --- a/Runtime/Character/CAnimationSet.cpp +++ b/Runtime/Character/CAnimationSet.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CMetaTransFactory.hpp" -namespace urde { +namespace metaforce { CAnimationSet::CAnimationSet(CInputStream& in) : x0_tableCount(in.readUint16Big()) { u32 animationCount = in.readUint32Big(); @@ -45,4 +45,4 @@ CAnimationSet::CAnimationSet(CInputStream& in) : x0_tableCount(in.readUint16Big( } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAnimationSet.hpp b/Runtime/Character/CAnimationSet.hpp index 55ae41fba..18cdd5e0a 100644 --- a/Runtime/Character/CAnimationSet.hpp +++ b/Runtime/Character/CAnimationSet.hpp @@ -11,7 +11,7 @@ #include "Runtime/Character/CHalfTransition.hpp" #include "Runtime/Character/CTransition.hpp" -namespace urde { +namespace metaforce { class CAnimationSet { u16 x0_tableCount; @@ -34,4 +34,4 @@ public: const CAdditiveAnimationInfo& GetDefaultAdditiveInfo() const { return x38_defaultAdditiveInfo; } const std::vector>& GetAnimResIds() const { return x50_animRes; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAssetFactory.cpp b/Runtime/Character/CAssetFactory.cpp index cf95602c8..c78d94b1a 100644 --- a/Runtime/Character/CAssetFactory.cpp +++ b/Runtime/Character/CAssetFactory.cpp @@ -6,7 +6,7 @@ #include "Runtime/Character/CCharLayoutInfo.hpp" #include "Runtime/Character/CModelData.hpp" -namespace urde { +namespace metaforce { CFactoryFnReturn CCharacterFactoryBuilder::CDummyFactory::Build(const SObjectTag& tag, const CVParamTransfer&, CObjectReference* selfRef) { @@ -36,24 +36,24 @@ void CCharacterFactoryBuilder::CDummyFactory::EnumerateResources( void CCharacterFactoryBuilder::CDummyFactory::EnumerateNamedResources( const std::function& lambda) const {} -u32 CCharacterFactoryBuilder::CDummyFactory::ResourceSize(const urde::SObjectTag& tag) { return 0; } +u32 CCharacterFactoryBuilder::CDummyFactory::ResourceSize(const metaforce::SObjectTag& tag) { return 0; } -std::shared_ptr CCharacterFactoryBuilder::CDummyFactory::LoadResourceAsync(const urde::SObjectTag& tag, +std::shared_ptr CCharacterFactoryBuilder::CDummyFactory::LoadResourceAsync(const metaforce::SObjectTag& tag, void* target) { return {}; } -std::shared_ptr CCharacterFactoryBuilder::CDummyFactory::LoadResourcePartAsync(const urde::SObjectTag& tag, +std::shared_ptr CCharacterFactoryBuilder::CDummyFactory::LoadResourcePartAsync(const metaforce::SObjectTag& tag, u32 off, u32 size, void* target) { return {}; } -std::unique_ptr CCharacterFactoryBuilder::CDummyFactory::LoadResourceSync(const urde::SObjectTag& tag) { +std::unique_ptr CCharacterFactoryBuilder::CDummyFactory::LoadResourceSync(const metaforce::SObjectTag& tag) { return {}; } -std::unique_ptr CCharacterFactoryBuilder::CDummyFactory::LoadNewResourcePartSync(const urde::SObjectTag& tag, +std::unique_ptr CCharacterFactoryBuilder::CDummyFactory::LoadNewResourcePartSync(const metaforce::SObjectTag& tag, u32 off, u32 size) { return {}; } @@ -64,4 +64,4 @@ TToken CCharacterFactoryBuilder::GetFactory(const CAnimRes& r return x4_dummyStore.GetObj({SBIG('ANCS'), res.GetId()}); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CAssetFactory.hpp b/Runtime/Character/CAssetFactory.hpp index 975124f7d..7364d6f6d 100644 --- a/Runtime/Character/CAssetFactory.hpp +++ b/Runtime/Character/CAssetFactory.hpp @@ -8,7 +8,7 @@ #include "Runtime/IFactory.hpp" #include "Runtime/IObj.hpp" -namespace urde { +namespace metaforce { class CCharacterFactory; class CAnimRes; @@ -27,12 +27,12 @@ public: void EnumerateResources(const std::function& lambda) const override; void EnumerateNamedResources(const std::function& lambda) const override; - u32 ResourceSize(const urde::SObjectTag& tag) override; - std::shared_ptr LoadResourceAsync(const urde::SObjectTag& tag, void* target) override; - std::shared_ptr LoadResourcePartAsync(const urde::SObjectTag& tag, u32 off, u32 size, + u32 ResourceSize(const metaforce::SObjectTag& tag) override; + std::shared_ptr LoadResourceAsync(const metaforce::SObjectTag& tag, void* target) override; + std::shared_ptr LoadResourcePartAsync(const metaforce::SObjectTag& tag, u32 off, u32 size, void* target) override; - std::unique_ptr LoadResourceSync(const urde::SObjectTag& tag) override; - std::unique_ptr LoadNewResourcePartSync(const urde::SObjectTag& tag, u32 off, u32 size) override; + std::unique_ptr LoadResourceSync(const metaforce::SObjectTag& tag) override; + std::unique_ptr LoadNewResourcePartSync(const metaforce::SObjectTag& tag, u32 off, u32 size) override; }; private: @@ -44,4 +44,4 @@ public: TToken GetFactory(const CAnimRes& res); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBodyController.cpp b/Runtime/Character/CBodyController.cpp index 2251e8846..f0bb979bf 100644 --- a/Runtime/Character/CBodyController.cpp +++ b/Runtime/Character/CBodyController.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CBodyController::CBodyController(CActor& actor, float turnSpeed, EBodyType bodyType) : x0_actor(actor) @@ -289,4 +289,4 @@ void CBodyController::FrozenBreakout() { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBodyController.hpp b/Runtime/Character/CBodyController.hpp index 980085c16..a9078f82d 100644 --- a/Runtime/Character/CBodyController.hpp +++ b/Runtime/Character/CBodyController.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class CActor; class CAnimPlaybackParms; class CPASAnimParmData; @@ -103,4 +103,4 @@ public: void SetRestrictedFlyerMoveSpeed(float speed) { x330_restrictedFlyerMoveSpeed = speed; } bool GetActive() const { return x300_25_active; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBodyState.cpp b/Runtime/Character/CBodyState.cpp index ab814acaf..47c769c7c 100644 --- a/Runtime/Character/CBodyState.cpp +++ b/Runtime/Character/CBodyState.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { void CBSAttack::Start(CBodyController& bc, CStateManager& mgr) { const auto* cmd = static_cast(bc.GetCommandMgr().GetCmd(EBodyStateCmd::MeleeAttack)); @@ -2203,4 +2203,4 @@ float CBSRestrictedFlyerLocomotion::ApplyLocomotionPhysics(float dt, CBodyContro return 0.f; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBodyState.hpp b/Runtime/Character/CBodyState.hpp index 0a82ea638..f17be786b 100644 --- a/Runtime/Character/CBodyState.hpp +++ b/Runtime/Character/CBodyState.hpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { class CBodyController; class CStateManager; class CActor; @@ -404,4 +404,4 @@ public: explicit CBSRestrictedFlyerLocomotion(CActor& actor); float ApplyLocomotionPhysics(float dt, CBodyController& bc) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBodyStateCmdMgr.cpp b/Runtime/Character/CBodyStateCmdMgr.cpp index 139a8bc3b..13e5c1ded 100644 --- a/Runtime/Character/CBodyStateCmdMgr.cpp +++ b/Runtime/Character/CBodyStateCmdMgr.cpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { CBodyStateCmdMgr::CBodyStateCmdMgr() { x40_commandTable.push_back(&xb8_getup); @@ -87,4 +87,4 @@ void CBodyStateCmdMgr::ClearLocomotionCmds() { x3c_steeringSpeed = 0.f; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBodyStateCmdMgr.hpp b/Runtime/Character/CBodyStateCmdMgr.hpp index 9e7773d68..4949a77c3 100644 --- a/Runtime/Character/CBodyStateCmdMgr.hpp +++ b/Runtime/Character/CBodyStateCmdMgr.hpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { class CBodyStateCmd { EBodyStateCmd x4_cmd; @@ -452,4 +452,4 @@ public: const zeus::CVector3f& GetAdditiveTargetVector() const { return x24_additiveTarget; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBodyStateInfo.cpp b/Runtime/Character/CBodyStateInfo.cpp index d9e8a16cb..a74d8cd19 100644 --- a/Runtime/Character/CBodyStateInfo.cpp +++ b/Runtime/Character/CBodyStateInfo.cpp @@ -3,7 +3,7 @@ #include "Runtime/Character/CBodyController.hpp" #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { CBodyStateInfo::CBodyStateInfo(CActor& actor, EBodyType type) { x34_24_changeLocoAtEndOfAnimOnly = false; @@ -434,4 +434,4 @@ bool CBodyStateInfo::ApplyHeadTracking() const { return GetCurrentState()->ApplyHeadTracking(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBodyStateInfo.hpp b/Runtime/Character/CBodyStateInfo.hpp index c36f9aab6..6f4392cd1 100644 --- a/Runtime/Character/CBodyStateInfo.hpp +++ b/Runtime/Character/CBodyStateInfo.hpp @@ -10,7 +10,7 @@ #include "Runtime/Character/CBodyState.hpp" #include "Runtime/Character/CharacterCommon.hpp" -namespace urde { +namespace metaforce { class CActor; class CBodyStateInfo { @@ -48,4 +48,4 @@ public: bool ApplyHeadTracking() const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBoneTracking.cpp b/Runtime/Character/CBoneTracking.cpp index af7490ece..4f4b560ed 100644 --- a/Runtime/Character/CBoneTracking.cpp +++ b/Runtime/Character/CBoneTracking.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CBoneTracking::CBoneTracking(const CAnimData& animData, std::string_view bone, float maxTrackingAngle, float angSpeed, EBoneTrackingFlags flags) @@ -107,4 +107,4 @@ void CBoneTracking::UnsetTarget() { x34_target = kInvalidUniqueId; } void CBoneTracking::SetTargetPosition(const zeus::CVector3f& targetPos) { x24_targetPosition = targetPos; } void CBoneTracking::SetNoHorizontalAim(bool b) { x36_28_noHorizontalAim = b; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBoneTracking.hpp b/Runtime/Character/CBoneTracking.hpp index e349f7fbb..56693b2fc 100644 --- a/Runtime/Character/CBoneTracking.hpp +++ b/Runtime/Character/CBoneTracking.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { class CAnimData; class CStateManager; class CBodyController; @@ -55,4 +55,4 @@ public: void SetNoHorizontalAim(bool b); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBoolPOINode.cpp b/Runtime/Character/CBoolPOINode.cpp index c4d2624f7..50e847dfe 100644 --- a/Runtime/Character/CBoolPOINode.cpp +++ b/Runtime/Character/CBoolPOINode.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CAnimSourceReader.hpp" -namespace urde { +namespace metaforce { CBoolPOINode::CBoolPOINode() : CPOINode("root", EPOIType::EmptyBool, CCharAnimTime(), -1, false, 1.f, -1, 0) {} @@ -14,4 +14,4 @@ CBoolPOINode CBoolPOINode::CopyNodeMinusStartTime(const CBoolPOINode& node, cons return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CBoolPOINode.hpp b/Runtime/Character/CBoolPOINode.hpp index c64468da7..d8bcc39cf 100644 --- a/Runtime/Character/CBoolPOINode.hpp +++ b/Runtime/Character/CBoolPOINode.hpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CPOINode.hpp" -namespace urde { +namespace metaforce { class IAnimSourceInfo; class CBoolPOINode : public CPOINode { @@ -15,4 +15,4 @@ public: static CBoolPOINode CopyNodeMinusStartTime(const CBoolPOINode& node, const CCharAnimTime& startTime); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CCharAnimTime.cpp b/Runtime/Character/CCharAnimTime.cpp index 14a72f1fc..93de6bdec 100644 --- a/Runtime/Character/CCharAnimTime.cpp +++ b/Runtime/Character/CCharAnimTime.cpp @@ -3,7 +3,7 @@ #include #include -namespace urde { +namespace metaforce { bool CCharAnimTime::EqualsZero() const { if (x4_type == EType::ZeroIncreasing || x4_type == EType::ZeroSteady || x4_type == EType::ZeroDecreasing) @@ -250,4 +250,4 @@ float CCharAnimTime::operator/(const CCharAnimTime& other) const { return x0_time / other.x0_time; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CCharAnimTime.hpp b/Runtime/Character/CCharAnimTime.hpp index e28e36e7d..e2aa45e3b 100644 --- a/Runtime/Character/CCharAnimTime.hpp +++ b/Runtime/Character/CCharAnimTime.hpp @@ -5,7 +5,7 @@ #undef min #undef max -namespace urde { +namespace metaforce { class CCharAnimTime { public: @@ -42,4 +42,4 @@ public: CCharAnimTime operator*(const float& other) const; float operator/(const CCharAnimTime& other) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CCharLayoutInfo.cpp b/Runtime/Character/CCharLayoutInfo.cpp index 74921214b..64b1941d5 100644 --- a/Runtime/Character/CCharLayoutInfo.cpp +++ b/Runtime/Character/CCharLayoutInfo.cpp @@ -2,7 +2,7 @@ #include "Runtime/CToken.hpp" -namespace urde { +namespace metaforce { zeus::CVector3f CCharLayoutInfo::GetFromParentUnrotated(const CSegId& id) const { const CCharLayoutNode::Bone& bone = x0_node->GetBoneMap()[id]; @@ -65,4 +65,4 @@ CFactoryFnReturn FCharLayoutInfo(const SObjectTag&, CInputStream& in, const CVPa return TToken::GetIObjObjectFor(std::make_unique(in)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CCharLayoutInfo.hpp b/Runtime/Character/CCharLayoutInfo.hpp index 663a0f0d3..1678f3281 100644 --- a/Runtime/Character/CCharLayoutInfo.hpp +++ b/Runtime/Character/CCharLayoutInfo.hpp @@ -13,7 +13,7 @@ #include -namespace urde { +namespace metaforce { class CCharLayoutNode { public: @@ -48,4 +48,4 @@ public: CFactoryFnReturn FCharLayoutInfo(const SObjectTag&, CInputStream&, const CVParamTransfer&, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CCharacterFactory.cpp b/Runtime/Character/CCharacterFactory.cpp index c0d2e71d7..50aba8405 100644 --- a/Runtime/Character/CCharacterFactory.cpp +++ b/Runtime/Character/CCharacterFactory.cpp @@ -15,7 +15,7 @@ #include "Runtime/Character/CTransitionManager.hpp" #include "Runtime/Graphics/CSkinnedModel.hpp" -namespace urde { +namespace metaforce { CFactoryFnReturn CCharacterFactory::CDummyFactory::Build(const SObjectTag& tag, const CVParamTransfer& params, CObjectReference* selfRef) { @@ -55,21 +55,21 @@ void CCharacterFactory::CDummyFactory::EnumerateResources(const std::function& lambda) const {} -u32 CCharacterFactory::CDummyFactory::ResourceSize(const urde::SObjectTag& tag) { return 0; } +u32 CCharacterFactory::CDummyFactory::ResourceSize(const metaforce::SObjectTag& tag) { return 0; } -std::shared_ptr CCharacterFactory::CDummyFactory::LoadResourceAsync(const urde::SObjectTag& tag, +std::shared_ptr CCharacterFactory::CDummyFactory::LoadResourceAsync(const metaforce::SObjectTag& tag, void* target) { return {}; } -std::shared_ptr CCharacterFactory::CDummyFactory::LoadResourcePartAsync(const urde::SObjectTag& tag, +std::shared_ptr CCharacterFactory::CDummyFactory::LoadResourcePartAsync(const metaforce::SObjectTag& tag, u32 off, u32 size, void* target) { return {}; } -std::unique_ptr CCharacterFactory::CDummyFactory::LoadResourceSync(const urde::SObjectTag& tag) { return {}; } +std::unique_ptr CCharacterFactory::CDummyFactory::LoadResourceSync(const metaforce::SObjectTag& tag) { return {}; } -std::unique_ptr CCharacterFactory::CDummyFactory::LoadNewResourcePartSync(const urde::SObjectTag& tag, u32 off, +std::unique_ptr CCharacterFactory::CDummyFactory::LoadNewResourcePartSync(const metaforce::SObjectTag& tag, u32 off, u32 size) { return {}; } @@ -158,4 +158,4 @@ CCharacterFactory::CCharacterFactory(CSimplePool& store, const CAnimCharacterSet x30_animSourceDB.push_back(store.GetObj({SBIG('ANIM'), prim.GetAnimResId()})); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CCharacterFactory.hpp b/Runtime/Character/CCharacterFactory.hpp index b1dcf44ed..a4ac2ba47 100644 --- a/Runtime/Character/CCharacterFactory.hpp +++ b/Runtime/Character/CCharacterFactory.hpp @@ -11,7 +11,7 @@ #include "Runtime/IObjFactory.hpp" #include "Runtime/Character/CAnimationSet.hpp" -namespace urde { +namespace metaforce { class CAdditiveAnimationInfo; class CAllFormatsAnimSource; class CAnimCharacterSet; @@ -38,12 +38,12 @@ public: void EnumerateResources(const std::function& lambda) const override; void EnumerateNamedResources(const std::function& lambda) const override; - u32 ResourceSize(const urde::SObjectTag& tag) override; - std::shared_ptr LoadResourceAsync(const urde::SObjectTag& tag, void* target) override; - std::shared_ptr LoadResourcePartAsync(const urde::SObjectTag& tag, u32 off, u32 size, + u32 ResourceSize(const metaforce::SObjectTag& tag) override; + std::shared_ptr LoadResourceAsync(const metaforce::SObjectTag& tag, void* target) override; + std::shared_ptr LoadResourcePartAsync(const metaforce::SObjectTag& tag, u32 off, u32 size, void* target) override; - std::unique_ptr LoadResourceSync(const urde::SObjectTag& tag) override; - std::unique_ptr LoadNewResourcePartSync(const urde::SObjectTag& tag, u32 off, u32 size) override; + std::unique_ptr LoadResourceSync(const metaforce::SObjectTag& tag) override; + std::unique_ptr LoadNewResourcePartSync(const metaforce::SObjectTag& tag, u32 off, u32 size) override; }; private: @@ -76,4 +76,4 @@ public: bool HasAdditiveInfo(s32 idx) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CCharacterInfo.cpp b/Runtime/Character/CCharacterInfo.cpp index f5610f613..7dec11562 100644 --- a/Runtime/Character/CCharacterInfo.cpp +++ b/Runtime/Character/CCharacterInfo.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CCharacterInfo.hpp" -namespace urde { +namespace metaforce { CCharacterInfo::CParticleResData::CParticleResData(CInputStream& in, u16 tableCount) { const u32 partCount = in.readUint32Big(); @@ -101,4 +101,4 @@ s32 CCharacterInfo::GetAnimationIndex(std::string_view name) const { return -1; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CCharacterInfo.hpp b/Runtime/Character/CCharacterInfo.hpp index 9f57b57d9..81dd92902 100644 --- a/Runtime/Character/CCharacterInfo.hpp +++ b/Runtime/Character/CCharacterInfo.hpp @@ -11,7 +11,7 @@ #include -namespace urde { +namespace metaforce { class CCharacterInfo { friend class CAnimData; @@ -68,4 +68,4 @@ public: s32 GetAnimationIndex(std::string_view) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CCharacterSet.cpp b/Runtime/Character/CCharacterSet.cpp index df95c94ca..a0bc9bbdc 100644 --- a/Runtime/Character/CCharacterSet.cpp +++ b/Runtime/Character/CCharacterSet.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CCharacterSet.hpp" -namespace urde { +namespace metaforce { CCharacterSet::CCharacterSet(CInputStream& in) : x0_version(in.readUint16Big()) { u32 charCount = in.readUint32Big(); @@ -10,4 +10,4 @@ CCharacterSet::CCharacterSet(CInputStream& in) : x0_version(in.readUint16Big()) } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CCharacterSet.hpp b/Runtime/Character/CCharacterSet.hpp index f3c8e46f7..2addb1bc7 100644 --- a/Runtime/Character/CCharacterSet.hpp +++ b/Runtime/Character/CCharacterSet.hpp @@ -6,7 +6,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/Character/CCharacterInfo.hpp" -namespace urde { +namespace metaforce { class CCharacterSet { u16 x0_version; @@ -17,4 +17,4 @@ public: const std::map& GetCharacterInfoMap() const { return x4_characters; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CEffectComponent.cpp b/Runtime/Character/CEffectComponent.cpp index 8839ff438..050a960d9 100644 --- a/Runtime/Character/CEffectComponent.cpp +++ b/Runtime/Character/CEffectComponent.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CEffectComponent.hpp" -namespace urde { +namespace metaforce { SObjectTag CEffectComponent::GetSObjectTagFromStream(CInputStream& in) { return SObjectTag(in); } @@ -13,4 +13,4 @@ CEffectComponent::CEffectComponent(CInputStream& in) { x30_flags = in.readUint32Big(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CEffectComponent.hpp b/Runtime/Character/CEffectComponent.hpp index f0a8a688c..856d33ab1 100644 --- a/Runtime/Character/CEffectComponent.hpp +++ b/Runtime/Character/CEffectComponent.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Character/CParticleData.hpp" -namespace urde { +namespace metaforce { class CEffectComponent { std::string x0_name; @@ -28,4 +28,4 @@ public: u32 GetFlags() const { return x30_flags; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CFBStreamedAnimReader.cpp b/Runtime/Character/CFBStreamedAnimReader.cpp index efed31535..a2a80ff6c 100644 --- a/Runtime/Character/CFBStreamedAnimReader.cpp +++ b/Runtime/Character/CFBStreamedAnimReader.cpp @@ -8,7 +8,7 @@ #include "Runtime/Character/CSegIdList.hpp" #include "Runtime/Character/CSegStatementSet.hpp" -namespace urde { +namespace metaforce { void CFBStreamedAnimReaderTotals::Allocate(u32 chanCount) { const u32 chan2 = chanCount * 2; @@ -508,4 +508,4 @@ zeus::CQuaternion CFBStreamedAnimReader::VGetRotation(const CSegId& seg) const { template class TAnimSourceInfo; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CFBStreamedAnimReader.hpp b/Runtime/Character/CFBStreamedAnimReader.hpp index aa892f081..39a394876 100644 --- a/Runtime/Character/CFBStreamedAnimReader.hpp +++ b/Runtime/Character/CFBStreamedAnimReader.hpp @@ -6,7 +6,7 @@ #include "Runtime/Character/CAnimSourceReader.hpp" #include "Runtime/Character/CFBStreamedCompression.hpp" -namespace urde { +namespace metaforce { class CBitLevelLoader; template @@ -122,4 +122,4 @@ public: zeus::CQuaternion VGetRotation(const CSegId& seg) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CFBStreamedCompression.cpp b/Runtime/Character/CFBStreamedCompression.cpp index cd8ce8b23..a2be29412 100644 --- a/Runtime/Character/CFBStreamedCompression.cpp +++ b/Runtime/Character/CFBStreamedCompression.cpp @@ -4,7 +4,7 @@ #include #include "Runtime/Character/CFBStreamedAnimReader.hpp" -namespace urde { +namespace metaforce { namespace { template T ReadValue(const u8* data) { @@ -271,4 +271,4 @@ float CFBStreamedCompression::CalculateAverageVelocity(const u8* chans) const { return accumMag / GetAnimationDuration().GetSeconds(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CFBStreamedCompression.hpp b/Runtime/Character/CFBStreamedCompression.hpp index 5c519280f..2d06cd1cc 100644 --- a/Runtime/Character/CFBStreamedCompression.hpp +++ b/Runtime/Character/CFBStreamedCompression.hpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { class IObjectStore; class CFBStreamedCompression { @@ -82,4 +82,4 @@ public: const std::vector& GetSoundPOIStream() const { return x8_evntToken->GetSoundPOIStream(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CGroundMovement.cpp b/Runtime/Character/CGroundMovement.cpp index e337c2ef9..31a4145c6 100644 --- a/Runtime/Character/CGroundMovement.cpp +++ b/Runtime/Character/CGroundMovement.cpp @@ -12,7 +12,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { void CGroundMovement::CheckFalling(CPhysicsActor& actor, CStateManager& mgr, float) { bool oob = true; @@ -742,4 +742,4 @@ CMaterialList CGroundMovement::MoveObjectAnalytical(CStateManager& mgr, CPhysics return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CGroundMovement.hpp b/Runtime/Character/CGroundMovement.hpp index bfcdcd5fd..74d4d08bd 100644 --- a/Runtime/Character/CGroundMovement.hpp +++ b/Runtime/Character/CGroundMovement.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CAreaCollisionCache; class CCollisionInfoList; class CMaterialFilter; @@ -69,4 +69,4 @@ public: SMoveObjectResult& result); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CHalfTransition.cpp b/Runtime/Character/CHalfTransition.cpp index 3c240eb5f..36a00f1e3 100644 --- a/Runtime/Character/CHalfTransition.cpp +++ b/Runtime/Character/CHalfTransition.cpp @@ -2,11 +2,11 @@ #include "Runtime/Character/CMetaTransFactory.hpp" -namespace urde { +namespace metaforce { CHalfTransition::CHalfTransition(CInputStream& in) { x0_id = in.readUint32Big(); x4_trans = CMetaTransFactory::CreateMetaTrans(in); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CHalfTransition.hpp b/Runtime/Character/CHalfTransition.hpp index 76d5a58bb..6d6150fb3 100644 --- a/Runtime/Character/CHalfTransition.hpp +++ b/Runtime/Character/CHalfTransition.hpp @@ -6,7 +6,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/IMetaTrans.hpp" -namespace urde { +namespace metaforce { class CHalfTransition { u32 x0_id; @@ -18,4 +18,4 @@ public: const std::shared_ptr& GetMetaTrans() const { return x4_trans; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CHierarchyPoseBuilder.cpp b/Runtime/Character/CHierarchyPoseBuilder.cpp index 763316e08..a06e2b468 100644 --- a/Runtime/Character/CHierarchyPoseBuilder.cpp +++ b/Runtime/Character/CHierarchyPoseBuilder.cpp @@ -5,7 +5,7 @@ #include -namespace urde { +namespace metaforce { void CHierarchyPoseBuilder::BuildIntoHierarchy(const CCharLayoutInfo& layout, const CSegId& boneId, const CSegId& nullId) { @@ -160,4 +160,4 @@ CHierarchyPoseBuilder::CHierarchyPoseBuilder(const CLayoutDescription& layout) BuildIntoHierarchy(layoutInfo, id, 2); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CHierarchyPoseBuilder.hpp b/Runtime/Character/CHierarchyPoseBuilder.hpp index abe1f13e2..64ad23477 100644 --- a/Runtime/Character/CHierarchyPoseBuilder.hpp +++ b/Runtime/Character/CHierarchyPoseBuilder.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CCharLayoutInfo; class CLayoutDescription; class CPoseAsTransforms; @@ -47,4 +47,4 @@ public: TSegIdMap& GetTreeMap() { return x38_treeMap; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CIkChain.cpp b/Runtime/Character/CIkChain.cpp index dbd0c44e0..a0adb83b0 100644 --- a/Runtime/Character/CIkChain.cpp +++ b/Runtime/Character/CIkChain.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CAnimData.hpp" -namespace urde { +namespace metaforce { void CIkChain::Update(float dt) { if (x44_24_activated) @@ -83,4 +83,4 @@ void CIkChain::Solve(zeus::CQuaternion& q1, zeus::CQuaternion& q2, const zeus::C q1 = zeus::CQuaternion::fromAxisAngle(crossVecB * (1.f / crossVecB.magnitude()), angle) * q1; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CIkChain.hpp b/Runtime/Character/CIkChain.hpp index 6908f0e2c..d46b93961 100644 --- a/Runtime/Character/CIkChain.hpp +++ b/Runtime/Character/CIkChain.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CAnimData; class CSegId; class CIkChain { @@ -33,4 +33,4 @@ public: void PreRender(CAnimData&, const zeus::CTransform&, const zeus::CVector3f&); void Solve(zeus::CQuaternion&, zeus::CQuaternion&, const zeus::CVector3f&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CInt32POINode.cpp b/Runtime/Character/CInt32POINode.cpp index a314a9df0..9c4870242 100644 --- a/Runtime/Character/CInt32POINode.cpp +++ b/Runtime/Character/CInt32POINode.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CAnimSourceReader.hpp" -namespace urde { +namespace metaforce { CInt32POINode::CInt32POINode() : CInt32POINode(""sv, EPOIType::EmptyInt32, CCharAnimTime(), -1, false, 1.f, -1, 0, 0, "root"sv) {} @@ -19,4 +19,4 @@ CInt32POINode CInt32POINode::CopyNodeMinusStartTime(const CInt32POINode& node, c return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CInt32POINode.hpp b/Runtime/Character/CInt32POINode.hpp index 2ca709b42..b632a65d4 100644 --- a/Runtime/Character/CInt32POINode.hpp +++ b/Runtime/Character/CInt32POINode.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/Character/CPOINode.hpp" -namespace urde { +namespace metaforce { class IAnimSourceInfo; class CInt32POINode : public CPOINode { @@ -22,4 +22,4 @@ public: static CInt32POINode CopyNodeMinusStartTime(const CInt32POINode& node, const CCharAnimTime& startTime); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CLayoutDescription.hpp b/Runtime/Character/CLayoutDescription.hpp index e6f29864a..ac39e8241 100644 --- a/Runtime/Character/CLayoutDescription.hpp +++ b/Runtime/Character/CLayoutDescription.hpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { class CCharLayoutInfo; class CLayoutDescription { @@ -40,4 +40,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimBlend.cpp b/Runtime/Character/CMetaAnimBlend.cpp index 521f43a45..a6c68d5e8 100644 --- a/Runtime/Character/CMetaAnimBlend.cpp +++ b/Runtime/Character/CMetaAnimBlend.cpp @@ -3,7 +3,7 @@ #include "Runtime/Character/CAnimTreeBlend.hpp" #include "Runtime/Character/CMetaAnimFactory.hpp" -namespace urde { +namespace metaforce { CMetaAnimBlend::CMetaAnimBlend(CInputStream& in) { x4_animA = CMetaAnimFactory::CreateMetaAnim(in); @@ -29,4 +29,4 @@ std::shared_ptr CMetaAnimBlend::VGetAnimationTree(const CAnimSysC CAnimTreeBlend::CreatePrimitiveName(a, b, xc_blend)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimBlend.hpp b/Runtime/Character/CMetaAnimBlend.hpp index 52bee1aa7..8b9997465 100644 --- a/Runtime/Character/CMetaAnimBlend.hpp +++ b/Runtime/Character/CMetaAnimBlend.hpp @@ -5,7 +5,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/IMetaAnim.hpp" -namespace urde { +namespace metaforce { class CMetaAnimBlend : public IMetaAnim { std::shared_ptr x4_animA; @@ -22,4 +22,4 @@ public: const CMetaAnimTreeBuildOrders& orders) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimFactory.cpp b/Runtime/Character/CMetaAnimFactory.cpp index 0efc33c20..daf92802e 100644 --- a/Runtime/Character/CMetaAnimFactory.cpp +++ b/Runtime/Character/CMetaAnimFactory.cpp @@ -6,7 +6,7 @@ #include "Runtime/Character/CMetaAnimRandom.hpp" #include "Runtime/Character/CMetaAnimSequence.hpp" -namespace urde { +namespace metaforce { std::shared_ptr CMetaAnimFactory::CreateMetaAnim(CInputStream& in) { EMetaAnimType type = EMetaAnimType(in.readUint32Big()); @@ -29,4 +29,4 @@ std::shared_ptr CMetaAnimFactory::CreateMetaAnim(CInputStream& in) { return {}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimFactory.hpp b/Runtime/Character/CMetaAnimFactory.hpp index 291bc368c..8f2d423ee 100644 --- a/Runtime/Character/CMetaAnimFactory.hpp +++ b/Runtime/Character/CMetaAnimFactory.hpp @@ -5,11 +5,11 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/IMetaAnim.hpp" -namespace urde { +namespace metaforce { class CMetaAnimFactory { public: static std::shared_ptr CreateMetaAnim(CInputStream& in); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimPhaseBlend.cpp b/Runtime/Character/CMetaAnimPhaseBlend.cpp index bbec54c51..68212cb2a 100644 --- a/Runtime/Character/CMetaAnimPhaseBlend.cpp +++ b/Runtime/Character/CMetaAnimPhaseBlend.cpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CAnimTreeTimeScale.hpp" #include "Runtime/Character/CMetaAnimFactory.hpp" -namespace urde { +namespace metaforce { CMetaAnimPhaseBlend::CMetaAnimPhaseBlend(CInputStream& in) { x4_animA = CMetaAnimFactory::CreateMetaAnim(in); @@ -40,4 +40,4 @@ std::shared_ptr CMetaAnimPhaseBlend::VGetAnimationTree(const CAni CAnimTreeBlend::CreatePrimitiveName(tsa, tsb, xc_blend)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimPhaseBlend.hpp b/Runtime/Character/CMetaAnimPhaseBlend.hpp index c8131ff59..df612b3c2 100644 --- a/Runtime/Character/CMetaAnimPhaseBlend.hpp +++ b/Runtime/Character/CMetaAnimPhaseBlend.hpp @@ -5,7 +5,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/IMetaAnim.hpp" -namespace urde { +namespace metaforce { class CMetaAnimPhaseBlend : public IMetaAnim { std::shared_ptr x4_animA; @@ -22,4 +22,4 @@ public: const CMetaAnimTreeBuildOrders& orders) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimPlay.cpp b/Runtime/Character/CMetaAnimPlay.cpp index 148464cdb..eca98a950 100644 --- a/Runtime/Character/CMetaAnimPlay.cpp +++ b/Runtime/Character/CMetaAnimPlay.cpp @@ -5,7 +5,7 @@ #include "Runtime/Character/CAnimSysContext.hpp" #include "Runtime/Character/CAnimTreeAnimReaderContainer.hpp" -namespace urde { +namespace metaforce { CMetaAnimPlay::CMetaAnimPlay(CInputStream& in) : x4_primitive(in), x1c_startTime(in) {} @@ -22,4 +22,4 @@ std::shared_ptr CMetaAnimPlay::VGetAnimationTree(const CAnimSysCo x4_primitive.GetName(), CAllFormatsAnimSource::GetNewReader(prim, x1c_startTime), x4_primitive.GetAnimDbIdx()); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimPlay.hpp b/Runtime/Character/CMetaAnimPlay.hpp index 2939fc24a..0508ea1ee 100644 --- a/Runtime/Character/CMetaAnimPlay.hpp +++ b/Runtime/Character/CMetaAnimPlay.hpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CPrimitive.hpp" #include "Runtime/Character/IMetaAnim.hpp" -namespace urde { +namespace metaforce { class CMetaAnimPlay : public IMetaAnim { CPrimitive x4_primitive; @@ -19,4 +19,4 @@ public: const CMetaAnimTreeBuildOrders& orders) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimRandom.cpp b/Runtime/Character/CMetaAnimRandom.cpp index 48c978667..02f1f1342 100644 --- a/Runtime/Character/CMetaAnimRandom.cpp +++ b/Runtime/Character/CMetaAnimRandom.cpp @@ -3,7 +3,7 @@ #include "Runtime/Character/CAnimSysContext.hpp" #include "Runtime/Character/CMetaAnimFactory.hpp" -namespace urde { +namespace metaforce { CMetaAnimRandom::RandomData CMetaAnimRandom::CreateRandomData(CInputStream& in) { CMetaAnimRandom::RandomData ret; @@ -39,4 +39,4 @@ std::shared_ptr CMetaAnimRandom::VGetAnimationTree(const CAnimSys return useRd->first->GetAnimationTree(animSys, orders); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimRandom.hpp b/Runtime/Character/CMetaAnimRandom.hpp index 8ee2a6b29..272c01bb6 100644 --- a/Runtime/Character/CMetaAnimRandom.hpp +++ b/Runtime/Character/CMetaAnimRandom.hpp @@ -7,7 +7,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/IMetaAnim.hpp" -namespace urde { +namespace metaforce { class CMetaAnimRandom : public IMetaAnim { using RandomData = std::vector, u32>>; @@ -23,4 +23,4 @@ public: const CMetaAnimTreeBuildOrders& orders) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimSequence.cpp b/Runtime/Character/CMetaAnimSequence.cpp index a781ddba5..a96539731 100644 --- a/Runtime/Character/CMetaAnimSequence.cpp +++ b/Runtime/Character/CMetaAnimSequence.cpp @@ -3,7 +3,7 @@ #include "Runtime/Character/CAnimTreeSequence.hpp" #include "Runtime/Character/CMetaAnimFactory.hpp" -namespace urde { +namespace metaforce { std::vector> CMetaAnimSequence::CreateSequence(CInputStream& in) { std::vector> ret; @@ -41,4 +41,4 @@ std::shared_ptr CMetaAnimSequence::VGetAnimationTree(const CAnimS return std::make_shared(x4_sequence, animSys, ""); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaAnimSequence.hpp b/Runtime/Character/CMetaAnimSequence.hpp index bc644b3e9..f937cce8c 100644 --- a/Runtime/Character/CMetaAnimSequence.hpp +++ b/Runtime/Character/CMetaAnimSequence.hpp @@ -6,7 +6,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/IMetaAnim.hpp" -namespace urde { +namespace metaforce { class CMetaAnimSequence : public IMetaAnim { std::vector> x4_sequence; @@ -21,4 +21,4 @@ public: const CMetaAnimTreeBuildOrders& orders) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaTransFactory.cpp b/Runtime/Character/CMetaTransFactory.cpp index 146645f65..1ae7d87fd 100644 --- a/Runtime/Character/CMetaTransFactory.cpp +++ b/Runtime/Character/CMetaTransFactory.cpp @@ -5,7 +5,7 @@ #include "Runtime/Character/CMetaTransSnap.hpp" #include "Runtime/Character/CMetaTransTrans.hpp" -namespace urde { +namespace metaforce { std::shared_ptr CMetaTransFactory::CreateMetaTrans(CInputStream& in) { EMetaTransType type = EMetaTransType(in.readUint32Big()); @@ -25,4 +25,4 @@ std::shared_ptr CMetaTransFactory::CreateMetaTrans(CInputStream& in) return {}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaTransFactory.hpp b/Runtime/Character/CMetaTransFactory.hpp index d56e54342..503c8331f 100644 --- a/Runtime/Character/CMetaTransFactory.hpp +++ b/Runtime/Character/CMetaTransFactory.hpp @@ -5,11 +5,11 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/IMetaTrans.hpp" -namespace urde { +namespace metaforce { class CMetaTransFactory { public: static std::shared_ptr CreateMetaTrans(CInputStream& in); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaTransMetaAnim.cpp b/Runtime/Character/CMetaTransMetaAnim.cpp index ce7365a71..c894a41ab 100644 --- a/Runtime/Character/CMetaTransMetaAnim.cpp +++ b/Runtime/Character/CMetaTransMetaAnim.cpp @@ -3,7 +3,7 @@ #include "Runtime/Character/CAnimTreeLoopIn.hpp" #include "Runtime/Character/CMetaAnimFactory.hpp" -namespace urde { +namespace metaforce { CMetaTransMetaAnim::CMetaTransMetaAnim(CInputStream& in) : x4_metaAnim(CMetaAnimFactory::CreateMetaAnim(in)) {} @@ -16,4 +16,4 @@ std::shared_ptr CMetaTransMetaAnim::VGetTransitionTree(const std: CAnimTreeLoopIn::CreatePrimitiveName(a, b, animNode)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaTransMetaAnim.hpp b/Runtime/Character/CMetaTransMetaAnim.hpp index 21e193015..55400a798 100644 --- a/Runtime/Character/CMetaTransMetaAnim.hpp +++ b/Runtime/Character/CMetaTransMetaAnim.hpp @@ -6,7 +6,7 @@ #include "Runtime/Character/IMetaAnim.hpp" #include "Runtime/Character/IMetaTrans.hpp" -namespace urde { +namespace metaforce { class CMetaTransMetaAnim : public IMetaTrans { std::shared_ptr x4_metaAnim; @@ -20,4 +20,4 @@ public: const CAnimSysContext& animSys) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaTransPhaseTrans.cpp b/Runtime/Character/CMetaTransPhaseTrans.cpp index 6b1804993..f158da0aa 100644 --- a/Runtime/Character/CMetaTransPhaseTrans.cpp +++ b/Runtime/Character/CMetaTransPhaseTrans.cpp @@ -5,7 +5,7 @@ #include "Runtime/Character/CAnimTreeTransition.hpp" #include "Runtime/Character/CTimeScaleFunctions.hpp" -namespace urde { +namespace metaforce { CMetaTransPhaseTrans::CMetaTransPhaseTrans(CInputStream& in) { x4_transDur = CCharAnimTime(in); @@ -37,4 +37,4 @@ std::shared_ptr CMetaTransPhaseTrans::VGetTransitionTree(const st CAnimTreeTransition::CreatePrimitiveName(tsA, tsB, x4_transDur.GetSeconds())); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaTransPhaseTrans.hpp b/Runtime/Character/CMetaTransPhaseTrans.hpp index 49005655c..08fd2ba98 100644 --- a/Runtime/Character/CMetaTransPhaseTrans.hpp +++ b/Runtime/Character/CMetaTransPhaseTrans.hpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CCharAnimTime.hpp" #include "Runtime/Character/IMetaTrans.hpp" -namespace urde { +namespace metaforce { class CMetaTransPhaseTrans : public IMetaTrans { CCharAnimTime x4_transDur; @@ -21,4 +21,4 @@ public: const CAnimSysContext& animSys) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaTransSnap.cpp b/Runtime/Character/CMetaTransSnap.cpp index 92d1711ca..302a85c7a 100644 --- a/Runtime/Character/CMetaTransSnap.cpp +++ b/Runtime/Character/CMetaTransSnap.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CMetaTransSnap.hpp" -namespace urde { +namespace metaforce { std::shared_ptr CMetaTransSnap::VGetTransitionTree(const std::weak_ptr& a, const std::weak_ptr& b, @@ -8,4 +8,4 @@ std::shared_ptr CMetaTransSnap::VGetTransitionTree(const std::wea return b.lock(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaTransSnap.hpp b/Runtime/Character/CMetaTransSnap.hpp index 78b40af48..091b73f68 100644 --- a/Runtime/Character/CMetaTransSnap.hpp +++ b/Runtime/Character/CMetaTransSnap.hpp @@ -3,7 +3,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/IMetaTrans.hpp" -namespace urde { +namespace metaforce { class CMetaTransSnap : public IMetaTrans { public: @@ -14,4 +14,4 @@ public: const CAnimSysContext& animSys) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaTransTrans.cpp b/Runtime/Character/CMetaTransTrans.cpp index 102d28310..a64b86b30 100644 --- a/Runtime/Character/CMetaTransTrans.cpp +++ b/Runtime/Character/CMetaTransTrans.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CAnimTreeTransition.hpp" -namespace urde { +namespace metaforce { CMetaTransTrans::CMetaTransTrans(CInputStream& in) { x4_transDur = CCharAnimTime(in); @@ -18,4 +18,4 @@ std::shared_ptr CMetaTransTrans::VGetTransitionTree(const std::we xc_, a, b, x4_transDur, xd_runA, x10_flags, CAnimTreeTransition::CreatePrimitiveName(a, b, x4_transDur.GetSeconds())); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CMetaTransTrans.hpp b/Runtime/Character/CMetaTransTrans.hpp index f1f259975..5a0b0f2a7 100644 --- a/Runtime/Character/CMetaTransTrans.hpp +++ b/Runtime/Character/CMetaTransTrans.hpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CCharAnimTime.hpp" #include "Runtime/Character/IMetaTrans.hpp" -namespace urde { +namespace metaforce { class CMetaTransTrans : public IMetaTrans { CCharAnimTime x4_transDur; @@ -21,4 +21,4 @@ public: const CAnimSysContext& animSys) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CModelData.cpp b/Runtime/Character/CModelData.cpp index 07385bbe8..85e4144b5 100644 --- a/Runtime/Character/CModelData.cpp +++ b/Runtime/Character/CModelData.cpp @@ -17,8 +17,8 @@ #include -namespace urde { -static logvisor::Module Log("urde::CModelData"); +namespace metaforce { +static logvisor::Module Log("metaforce::CModelData"); CModelData::~CModelData() = default; @@ -448,4 +448,4 @@ void CModelData::DisintegrateDraw(EWhichModel which, const zeus::CTransform& xf, } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CModelData.hpp b/Runtime/Character/CModelData.hpp index feb5baa9b..33f71d906 100644 --- a/Runtime/Character/CModelData.hpp +++ b/Runtime/Character/CModelData.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CActorLights; class CAnimData; class CCharAnimTime; @@ -172,4 +172,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPASAnimInfo.cpp b/Runtime/Character/CPASAnimInfo.cpp index 6a11905b1..930d1edc0 100644 --- a/Runtime/Character/CPASAnimInfo.cpp +++ b/Runtime/Character/CPASAnimInfo.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CPASAnimInfo.hpp" -namespace urde { +namespace metaforce { CPASAnimInfo::CPASAnimInfo(u32 id, rstl::reserved_vector&& parms) : x0_id(id), x4_parms(std::move(parms)) {} @@ -35,4 +35,4 @@ CPASAnimParm CPASAnimInfo::GetAnimParmData(size_t idx, CPASAnimParm::EParmType t } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPASAnimInfo.hpp b/Runtime/Character/CPASAnimInfo.hpp index a679f71f7..bcf3f17fd 100644 --- a/Runtime/Character/CPASAnimInfo.hpp +++ b/Runtime/Character/CPASAnimInfo.hpp @@ -4,7 +4,7 @@ #include "Runtime/rstl.hpp" #include "Runtime/Character/CPASAnimParm.hpp" -namespace urde { +namespace metaforce { class CPASAnimInfo { u32 x0_id; @@ -18,4 +18,4 @@ public: CPASAnimParm GetAnimParmData(size_t idx, CPASAnimParm::EParmType type) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPASAnimParm.hpp b/Runtime/Character/CPASAnimParm.hpp index bf706374f..6637ae076 100644 --- a/Runtime/Character/CPASAnimParm.hpp +++ b/Runtime/Character/CPASAnimParm.hpp @@ -2,7 +2,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CPASAnimParm { public: @@ -65,4 +65,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPASAnimParmData.cpp b/Runtime/Character/CPASAnimParmData.cpp index 85138de6c..59df1c3ec 100644 --- a/Runtime/Character/CPASAnimParmData.cpp +++ b/Runtime/Character/CPASAnimParmData.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CPASAnimParmData.hpp" -namespace urde { +namespace metaforce { CPASAnimParmData::CPASAnimParmData(pas::EAnimationState stateId, const CPASAnimParm& parm1, const CPASAnimParm& parm2, const CPASAnimParm& parm3, const CPASAnimParm& parm4, const CPASAnimParm& parm5, @@ -16,4 +16,4 @@ CPASAnimParmData::CPASAnimParmData(pas::EAnimationState stateId, const CPASAnimP x4_parms.push_back(parm8); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPASAnimParmData.hpp b/Runtime/Character/CPASAnimParmData.hpp index d66cd7f3a..29473e338 100644 --- a/Runtime/Character/CPASAnimParmData.hpp +++ b/Runtime/Character/CPASAnimParmData.hpp @@ -5,7 +5,7 @@ #include "Runtime/Character/CharacterCommon.hpp" #include "Runtime/Character/CPASAnimParm.hpp" -namespace urde { +namespace metaforce { class CPASAnimParmData { pas::EAnimationState x0_stateId; rstl::reserved_vector x4_parms; @@ -27,4 +27,4 @@ public: static auto NoParameters(pas::EAnimationState stateId) { return CPASAnimParmData(stateId); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPASAnimState.cpp b/Runtime/Character/CPASAnimState.cpp index 311cb8c3b..1c02ffd78 100644 --- a/Runtime/Character/CPASAnimState.cpp +++ b/Runtime/Character/CPASAnimState.cpp @@ -11,7 +11,7 @@ #include -namespace urde { +namespace metaforce { CPASAnimState::CPASAnimState(CInputStream& in) { x0_id = static_cast(in.readUint32Big()); @@ -253,4 +253,4 @@ float CPASAnimState::ComputeAngularPercentErrorWeight(size_t idx, const CPASAnim return (val >= FLT_EPSILON ? 0.f : 1.f); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPASAnimState.hpp b/Runtime/Character/CPASAnimState.hpp index 5f4077b63..98c258acc 100644 --- a/Runtime/Character/CPASAnimState.hpp +++ b/Runtime/Character/CPASAnimState.hpp @@ -8,7 +8,7 @@ #include "Runtime/Character/CPASAnimInfo.hpp" #include "Runtime/Character/CPASParmInfo.hpp" -namespace urde { +namespace metaforce { class CRandom16; class CPASAnimParmData; class CPASAnimState { @@ -34,4 +34,4 @@ public: s32 ignoreAnim) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPASDatabase.cpp b/Runtime/Character/CPASDatabase.cpp index b15f70952..d6d922684 100644 --- a/Runtime/Character/CPASDatabase.cpp +++ b/Runtime/Character/CPASDatabase.cpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { void CPASDatabase::AddAnimState(CPASAnimState&& state) { auto it = std::lower_bound(x0_states.begin(), x0_states.end(), state, @@ -47,4 +47,4 @@ std::pair CPASDatabase::FindBestAnimation(const CPASAnimParmData& da return (*it).FindBestAnimation(data.GetAnimParmData(), rand, ignoreAnim); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPASDatabase.hpp b/Runtime/Character/CPASDatabase.hpp index 73d6c29f7..ddd7d786d 100644 --- a/Runtime/Character/CPASDatabase.hpp +++ b/Runtime/Character/CPASDatabase.hpp @@ -7,7 +7,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/CPASAnimState.hpp" -namespace urde { +namespace metaforce { class CRandom16; class CPASAnimParmData; @@ -46,4 +46,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPASParmInfo.cpp b/Runtime/Character/CPASParmInfo.cpp index 942bb0fe4..80920c0b4 100644 --- a/Runtime/Character/CPASParmInfo.cpp +++ b/Runtime/Character/CPASParmInfo.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CPASParmInfo.hpp" -namespace urde { +namespace metaforce { CPASParmInfo::CPASParmInfo(CInputStream& in) { xc_min.m_int = 0; @@ -35,4 +35,4 @@ CPASParmInfo::CPASParmInfo(CInputStream& in) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPASParmInfo.hpp b/Runtime/Character/CPASParmInfo.hpp index 63b6db404..6b10b5dd0 100644 --- a/Runtime/Character/CPASParmInfo.hpp +++ b/Runtime/Character/CPASParmInfo.hpp @@ -3,7 +3,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/CPASAnimParm.hpp" -namespace urde { +namespace metaforce { class CPASParmInfo { public: @@ -25,4 +25,4 @@ public: CPASAnimParm::UParmValue GetWeightMaxValue() const { return x10_max; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPOINode.cpp b/Runtime/Character/CPOINode.cpp index 3d1196b51..9e3ece784 100644 --- a/Runtime/Character/CPOINode.cpp +++ b/Runtime/Character/CPOINode.cpp @@ -6,7 +6,7 @@ #include "Runtime/Character/CParticlePOINode.hpp" #include "Runtime/Character/CSoundPOINode.hpp" -namespace urde { +namespace metaforce { CPOINode::CPOINode(std::string_view name, EPOIType type, const CCharAnimTime& time, s32 index, bool unique, float weight, s32 e, s32 f) @@ -120,4 +120,4 @@ template size_t _getPOIList(const CCharAnimTime& time, CSoundPOIN size_t iterator, u32 unk1, const std::vector& stream, const CCharAnimTime& curTime); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPOINode.hpp b/Runtime/Character/CPOINode.hpp index 8c58fd4f7..c7e2bdbff 100644 --- a/Runtime/Character/CPOINode.hpp +++ b/Runtime/Character/CPOINode.hpp @@ -6,7 +6,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/CCharAnimTime.hpp" -namespace urde { +namespace metaforce { class IAnimSourceInfo; enum class EPOIType : u16 { @@ -61,4 +61,4 @@ template size_t _getPOIList(const CCharAnimTime& time, T* listOut, size_t capacity, size_t iterator, u32 unk1, const std::vector& stream, const CCharAnimTime& curTime); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CParticleData.cpp b/Runtime/Character/CParticleData.cpp index 48c0c60cd..c54b8bc26 100644 --- a/Runtime/Character/CParticleData.cpp +++ b/Runtime/Character/CParticleData.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CParticleData.hpp" -namespace urde { +namespace metaforce { CParticleData::CParticleData(CInputStream& in) : x0_duration(in.readUint32Big()) @@ -9,4 +9,4 @@ CParticleData::CParticleData(CInputStream& in) , x1c_scale(in.readFloatBig()) , x20_parentMode(EParentedMode(in.readUint32Big())) {} -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CParticleData.hpp b/Runtime/Character/CParticleData.hpp index 7ba389327..80f14dbd7 100644 --- a/Runtime/Character/CParticleData.hpp +++ b/Runtime/Character/CParticleData.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { class CParticleData { public: @@ -47,4 +47,4 @@ public: float GetScale() const { return x18_scale; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CParticleDatabase.cpp b/Runtime/Character/CParticleDatabase.cpp index 0cc5fc213..dc6f65e91 100644 --- a/Runtime/Character/CParticleDatabase.cpp +++ b/Runtime/Character/CParticleDatabase.cpp @@ -8,7 +8,7 @@ #include "Runtime/Particle/CParticleElectric.hpp" #include "Runtime/Particle/CParticleSwoosh.hpp" -namespace urde { +namespace metaforce { CParticleDatabase::CParticleDatabase() = default; @@ -448,4 +448,4 @@ void CParticleDatabase::InsertParticleGen(bool oneShot, int flags, std::string_v } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CParticleDatabase.hpp b/Runtime/Character/CParticleDatabase.hpp index 7b832b07f..931e2fa23 100644 --- a/Runtime/Character/CParticleDatabase.hpp +++ b/Runtime/Character/CParticleDatabase.hpp @@ -14,7 +14,7 @@ #include #include -namespace urde { +namespace metaforce { class CCharLayoutInfo; class CPoseAsTransforms; @@ -71,4 +71,4 @@ public: bool AreAnySystemsDrawnWithModel() const { return xb4_25_anySystemsDrawnWithModel; } void SetUpdatesEnabled(bool active) { xb4_24_updatesEnabled = active; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CParticleGenInfo.cpp b/Runtime/Character/CParticleGenInfo.cpp index 1ffb93378..a76fcfba2 100644 --- a/Runtime/Character/CParticleGenInfo.cpp +++ b/Runtime/Character/CParticleGenInfo.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CParticleGenInfo::CParticleGenInfo(const SObjectTag& part, int frameCount, std::string_view boneName, const zeus::CVector3f& scale, CParticleData::EParentedMode parentMode, int flags, @@ -146,4 +146,4 @@ void CParticleGenInfoGeneric::DeleteLight(CStateManager& mgr) { } void CParticleGenInfoGeneric::SetModulationColor(const zeus::CColor& color) { x84_system->SetModulationColor(color); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CParticleGenInfo.hpp b/Runtime/Character/CParticleGenInfo.hpp index b1f8e1992..3965d0c4b 100644 --- a/Runtime/Character/CParticleGenInfo.hpp +++ b/Runtime/Character/CParticleGenInfo.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CParticleGen; class CStateManager; struct SObjectTag; @@ -108,4 +108,4 @@ public: void SetModulationColor(const zeus::CColor& color) override; const std::shared_ptr& GetParticleSystem() const { return x84_system; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CParticlePOINode.cpp b/Runtime/Character/CParticlePOINode.cpp index 514b57700..b72be371a 100644 --- a/Runtime/Character/CParticlePOINode.cpp +++ b/Runtime/Character/CParticlePOINode.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CAnimSourceReader.hpp" -namespace urde { +namespace metaforce { CParticlePOINode::CParticlePOINode() : CPOINode("root", EPOIType::Particle, CCharAnimTime(), -1, false, 1.f, -1, 0) {} @@ -15,4 +15,4 @@ CParticlePOINode CParticlePOINode::CopyNodeMinusStartTime(const CParticlePOINode return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CParticlePOINode.hpp b/Runtime/Character/CParticlePOINode.hpp index 33180a624..9225d896c 100644 --- a/Runtime/Character/CParticlePOINode.hpp +++ b/Runtime/Character/CParticlePOINode.hpp @@ -3,7 +3,7 @@ #include "Runtime/Character/CParticleData.hpp" #include "Runtime/Character/CPOINode.hpp" -namespace urde { +namespace metaforce { class IAnimSourceInfo; class CParticlePOINode : public CPOINode { @@ -17,4 +17,4 @@ public: static CParticlePOINode CopyNodeMinusStartTime(const CParticlePOINode& node, const CCharAnimTime& startTime); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPoseAsTransforms.cpp b/Runtime/Character/CPoseAsTransforms.cpp index 8c7b91d57..1631476e2 100644 --- a/Runtime/Character/CPoseAsTransforms.cpp +++ b/Runtime/Character/CPoseAsTransforms.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CCharLayoutInfo.hpp" -namespace urde { +namespace metaforce { CPoseAsTransforms::CPoseAsTransforms(u8 boneCount) : x1_count(boneCount), xd0_transformArr(new Transform[boneCount]) {} @@ -58,4 +58,4 @@ void CPoseAsTransforms::Insert(const CSegId& id, const zeus::CMatrix3f& rotation ++x0_nextId; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPoseAsTransforms.hpp b/Runtime/Character/CPoseAsTransforms.hpp index e896eb438..1c5cf5bb6 100644 --- a/Runtime/Character/CPoseAsTransforms.hpp +++ b/Runtime/Character/CPoseAsTransforms.hpp @@ -12,7 +12,7 @@ #include #include -namespace urde { +namespace metaforce { class CPoseAsTransforms { friend class CAnimData; public: @@ -42,4 +42,4 @@ public: const zeus::CVector3f& restOffset); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPrimitive.cpp b/Runtime/Character/CPrimitive.cpp index af081a2b9..3857528c0 100644 --- a/Runtime/Character/CPrimitive.cpp +++ b/Runtime/Character/CPrimitive.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CPrimitive.hpp" -namespace urde { +namespace metaforce { CPrimitive::CPrimitive(CInputStream& in) { x0_animId = in.readUint32Big(); @@ -8,4 +8,4 @@ CPrimitive::CPrimitive(CInputStream& in) { x8_animName = in.readString(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CPrimitive.hpp b/Runtime/Character/CPrimitive.hpp index db9a44c8f..0fcf01c49 100644 --- a/Runtime/Character/CPrimitive.hpp +++ b/Runtime/Character/CPrimitive.hpp @@ -5,7 +5,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CPrimitive { CAssetId x0_animId; @@ -20,4 +20,4 @@ public: bool operator<(const CPrimitive& other) const { return x8_animName < other.x8_animName; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CRagDoll.cpp b/Runtime/Character/CRagDoll.cpp index ef4c79499..7f7ba3a25 100644 --- a/Runtime/Character/CRagDoll.cpp +++ b/Runtime/Character/CRagDoll.cpp @@ -7,7 +7,7 @@ #include "Runtime/Collision/CMaterialFilter.hpp" #include "Runtime/Collision/CMetroidAreaCollider.hpp" -namespace urde { +namespace metaforce { void CRagDoll::CRagDollLengthConstraint::Update() { zeus::CVector3f delta = x4_p2->x4_curPos - x0_p1->x4_curPos; @@ -321,4 +321,4 @@ void CRagDoll::Prime(CStateManager& mgr, const zeus::CTransform& xf, CModelData& x68_26_primed = true; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CRagDoll.hpp b/Runtime/Character/CRagDoll.hpp index 3f1ca7c62..c29a1aac1 100644 --- a/Runtime/Character/CRagDoll.hpp +++ b/Runtime/Character/CRagDoll.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CCharLayoutInfo; class CHierarchyPoseBuilder; class CModelData; @@ -132,4 +132,4 @@ public: u32 GetImpactCount() const { return x4c_impactCount; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSegId.hpp b/Runtime/Character/CSegId.hpp index 7a930b3ff..3bcaa78d2 100644 --- a/Runtime/Character/CSegId.hpp +++ b/Runtime/Character/CSegId.hpp @@ -3,7 +3,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CSegId { u8 x0_segId = 0xFF; @@ -26,4 +26,4 @@ public: constexpr bool IsInvalid() const noexcept { return x0_segId == 0xFF; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSegIdList.cpp b/Runtime/Character/CSegIdList.cpp index b5f0a5d8b..aecb44d48 100644 --- a/Runtime/Character/CSegIdList.cpp +++ b/Runtime/Character/CSegIdList.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CSegIdList.hpp" -namespace urde { +namespace metaforce { CSegIdList::CSegIdList(CInputStream& in) { u32 count = in.readUint32Big(); @@ -9,4 +9,4 @@ CSegIdList::CSegIdList(CInputStream& in) { x0_list.emplace_back(in); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSegIdList.hpp b/Runtime/Character/CSegIdList.hpp index 37eceb21c..8ff76daa3 100644 --- a/Runtime/Character/CSegIdList.hpp +++ b/Runtime/Character/CSegIdList.hpp @@ -5,7 +5,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/CSegId.hpp" -namespace urde { +namespace metaforce { class CSegIdList { std::vector x0_list; @@ -15,4 +15,4 @@ public: const std::vector& GetList() const { return x0_list; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSegStatementSet.cpp b/Runtime/Character/CSegStatementSet.cpp index a0bd0ca6f..962e82301 100644 --- a/Runtime/Character/CSegStatementSet.cpp +++ b/Runtime/Character/CSegStatementSet.cpp @@ -3,7 +3,7 @@ #include "Runtime/Character/CCharLayoutInfo.hpp" #include "Runtime/Character/CSegIdList.hpp" -namespace urde { +namespace metaforce { void CSegStatementSet::Add(const CSegIdList& list, const CCharLayoutInfo& layout, const CSegStatementSet& other, float weight) { @@ -17,4 +17,4 @@ void CSegStatementSet::Add(const CSegIdList& list, const CCharLayoutInfo& layout } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSegStatementSet.hpp b/Runtime/Character/CSegStatementSet.hpp index 48b40c7d4..76513547c 100644 --- a/Runtime/Character/CSegStatementSet.hpp +++ b/Runtime/Character/CSegStatementSet.hpp @@ -5,7 +5,7 @@ #include "Runtime/Character/CAnimPerSegmentData.hpp" #include "Runtime/Character/CSegId.hpp" -namespace urde { +namespace metaforce { class CCharLayoutInfo; class CSegIdList; @@ -22,4 +22,4 @@ public: const CAnimPerSegmentData& operator[](const CSegId& idx) const { return x4_segData[idx]; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSequenceHelper.cpp b/Runtime/Character/CSequenceHelper.cpp index 85adad75e..a0bcda365 100644 --- a/Runtime/Character/CSequenceHelper.cpp +++ b/Runtime/Character/CSequenceHelper.cpp @@ -10,7 +10,7 @@ #include "Runtime/Character/CTreeUtils.hpp" #include "Runtime/Character/IMetaAnim.hpp" -namespace urde { +namespace metaforce { CSequenceFundamentals::CSequenceFundamentals(const CSteadyStateAnimInfo& ssInfo, std::vector boolNodes, std::vector int32Nodes, @@ -110,4 +110,4 @@ CSequenceFundamentals CSequenceHelper::ComputeSequenceFundamentals() { return {{false, duration, offset}, boolNodes, int32Nodes, particleNodes, soundNodes}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSequenceHelper.hpp b/Runtime/Character/CSequenceHelper.hpp index da275ec72..819d66b7c 100644 --- a/Runtime/Character/CSequenceHelper.hpp +++ b/Runtime/Character/CSequenceHelper.hpp @@ -11,7 +11,7 @@ #include "Runtime/Character/CSoundPOINode.hpp" #include "Runtime/Character/CTransitionDatabaseGame.hpp" -namespace urde { +namespace metaforce { class IMetaAnim; class CSequenceFundamentals { @@ -45,4 +45,4 @@ public: CSequenceFundamentals ComputeSequenceFundamentals(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSkinBank.cpp b/Runtime/Character/CSkinBank.cpp index 517679b67..487a58875 100644 --- a/Runtime/Character/CSkinBank.cpp +++ b/Runtime/Character/CSkinBank.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CPoseAsTransforms.hpp" -namespace urde { +namespace metaforce { CSkinBank::CSkinBank(CInputStream& in) { u32 boneCount = in.readUint32Big(); @@ -18,4 +18,4 @@ void CSkinBank::GetBankTransforms(std::vector& out, con } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSkinBank.hpp b/Runtime/Character/CSkinBank.hpp index 604d19b17..843a12c1e 100644 --- a/Runtime/Character/CSkinBank.hpp +++ b/Runtime/Character/CSkinBank.hpp @@ -5,7 +5,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/CSegId.hpp" -namespace urde { +namespace metaforce { class CPoseAsTransforms; class CSkinBank { @@ -16,4 +16,4 @@ public: void GetBankTransforms(std::vector& out, const CPoseAsTransforms& pose) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSkinRules.cpp b/Runtime/Character/CSkinRules.cpp index 0aac67bdc..ffb7f69fb 100644 --- a/Runtime/Character/CSkinRules.cpp +++ b/Runtime/Character/CSkinRules.cpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CPoseAsTransforms.hpp" #include "Runtime/Graphics/CModel.hpp" -namespace urde { +namespace metaforce { CSkinRules::CSkinRules(CInputStream& in) { u32 bankCount = in.readUint32Big(); @@ -46,4 +46,4 @@ CFactoryFnReturn FSkinRulesFactory(const SObjectTag& tag, CInputStream& in, cons return TToken::GetIObjObjectFor(std::make_unique(in)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSkinRules.hpp b/Runtime/Character/CSkinRules.hpp index 770061b9c..bdca237c8 100644 --- a/Runtime/Character/CSkinRules.hpp +++ b/Runtime/Character/CSkinRules.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CPoseAsTransforms; class CModel; @@ -59,4 +59,4 @@ public: CFactoryFnReturn FSkinRulesFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& params, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSoundPOINode.cpp b/Runtime/Character/CSoundPOINode.cpp index c7ac311cf..53a2b3c1f 100644 --- a/Runtime/Character/CSoundPOINode.cpp +++ b/Runtime/Character/CSoundPOINode.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CAnimSourceReader.hpp" -namespace urde { +namespace metaforce { CSoundPOINode::CSoundPOINode() : CPOINode("root", EPOIType::Sound, CCharAnimTime(), -1, false, 1.f, -1, 0) @@ -23,4 +23,4 @@ CSoundPOINode CSoundPOINode::CopyNodeMinusStartTime(const CSoundPOINode& node, c return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSoundPOINode.hpp b/Runtime/Character/CSoundPOINode.hpp index 4e243fd5c..cb1144351 100644 --- a/Runtime/Character/CSoundPOINode.hpp +++ b/Runtime/Character/CSoundPOINode.hpp @@ -3,7 +3,7 @@ #include "Runtime/Character/CCharAnimTime.hpp" #include "Runtime/Character/CPOINode.hpp" -namespace urde { +namespace metaforce { class IAnimSourceInfo; class CSoundPOINode : public CPOINode { @@ -23,4 +23,4 @@ public: float GetMaxDist() const { return x40_maxDist; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSteeringBehaviors.cpp b/Runtime/Character/CSteeringBehaviors.cpp index 86b29ae35..b23a4d5d3 100644 --- a/Runtime/Character/CSteeringBehaviors.cpp +++ b/Runtime/Character/CSteeringBehaviors.cpp @@ -3,7 +3,7 @@ #include "Runtime/CStateManager.hpp" #include "Runtime/World/CPhysicsActor.hpp" -namespace urde { +namespace metaforce { zeus::CVector3f CSteeringBehaviors::Flee(const CPhysicsActor& actor, const zeus::CVector3f& v0) const { zeus::CVector3f actVec = actor.GetTranslation() - v0; @@ -363,4 +363,4 @@ zeus::CVector3f CSteeringBehaviors::ProjectOrbitalPosition(const zeus::CVector3f return usePos; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CSteeringBehaviors.hpp b/Runtime/Character/CSteeringBehaviors.hpp index 12a0f2d8d..e9813b4c8 100644 --- a/Runtime/Character/CSteeringBehaviors.hpp +++ b/Runtime/Character/CSteeringBehaviors.hpp @@ -6,7 +6,7 @@ #include #include -namespace urde { +namespace metaforce { class CPhysicsActor; class CStateManager; @@ -41,4 +41,4 @@ public: const zeus::CVector3f& orbitPoint, float dt, float preThinkDt); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CTimeScaleFunctions.cpp b/Runtime/Character/CTimeScaleFunctions.cpp index 18817fea7..83b99fa80 100644 --- a/Runtime/Character/CTimeScaleFunctions.cpp +++ b/Runtime/Character/CTimeScaleFunctions.cpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { std::unique_ptr IVaryingAnimationTimeScale::Clone() const { return VClone(); } @@ -87,4 +87,4 @@ std::unique_ptr CLinearAnimationTimeScale::VGetFunct return x4_desc.FunctionMirroredAround(value); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CTimeScaleFunctions.hpp b/Runtime/Character/CTimeScaleFunctions.hpp index 0829b96e3..720c36167 100644 --- a/Runtime/Character/CTimeScaleFunctions.hpp +++ b/Runtime/Character/CTimeScaleFunctions.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Character/CCharAnimTime.hpp" -namespace urde { +namespace metaforce { enum class EVaryingAnimationTimeScaleType { Constant, Linear }; @@ -55,4 +55,4 @@ public: std::unique_ptr VGetFunctionMirrored(float value) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CTransition.cpp b/Runtime/Character/CTransition.cpp index 4df34a5aa..db98cd867 100644 --- a/Runtime/Character/CTransition.cpp +++ b/Runtime/Character/CTransition.cpp @@ -1,6 +1,6 @@ #include "Runtime/Character/CTransition.hpp" -namespace urde { +namespace metaforce { CTransition::CTransition(CInputStream& in) : x0_id(in.readUint32Big()) @@ -8,4 +8,4 @@ CTransition::CTransition(CInputStream& in) , x8_animB(in.readUint32Big()) , xc_trans(CMetaTransFactory::CreateMetaTrans(in)) {} -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CTransition.hpp b/Runtime/Character/CTransition.hpp index 80f74ab70..8a062f03f 100644 --- a/Runtime/Character/CTransition.hpp +++ b/Runtime/Character/CTransition.hpp @@ -6,7 +6,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/Character/CMetaTransFactory.hpp" -namespace urde { +namespace metaforce { class CTransition { u32 x0_id; @@ -22,4 +22,4 @@ public: const std::shared_ptr& GetMetaTrans() const { return xc_trans; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CTransitionDatabase.hpp b/Runtime/Character/CTransitionDatabase.hpp index 891bbf166..076496fe7 100644 --- a/Runtime/Character/CTransitionDatabase.hpp +++ b/Runtime/Character/CTransitionDatabase.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class IMetaTrans; class CTransitionDatabase { @@ -12,4 +12,4 @@ public: virtual const std::shared_ptr& GetMetaTrans(u32, u32) const = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CTransitionDatabaseGame.cpp b/Runtime/Character/CTransitionDatabaseGame.cpp index 37a09bbdc..fd3407587 100644 --- a/Runtime/Character/CTransitionDatabaseGame.cpp +++ b/Runtime/Character/CTransitionDatabaseGame.cpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { CTransitionDatabaseGame::CTransitionDatabaseGame(const std::vector& transitions, const std::vector& halfTransitions, @@ -42,4 +42,4 @@ const std::shared_ptr& CTransitionDatabaseGame::GetMetaTrans(u32 a, return x10_defaultTrans; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CTransitionDatabaseGame.hpp b/Runtime/Character/CTransitionDatabaseGame.hpp index d464cd6b6..16e71c454 100644 --- a/Runtime/Character/CTransitionDatabaseGame.hpp +++ b/Runtime/Character/CTransitionDatabaseGame.hpp @@ -6,7 +6,7 @@ #include "Runtime/Character/CTransitionDatabase.hpp" -namespace urde { +namespace metaforce { class CTransition; class CHalfTransition; @@ -22,4 +22,4 @@ public: const std::shared_ptr& GetMetaTrans(u32, u32) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CTransitionManager.cpp b/Runtime/Character/CTransitionManager.cpp index 94a867e8a..e7225fe2e 100644 --- a/Runtime/Character/CTransitionManager.cpp +++ b/Runtime/Character/CTransitionManager.cpp @@ -2,11 +2,11 @@ #include "Runtime/Character/CTreeUtils.hpp" -namespace urde { +namespace metaforce { std::shared_ptr CTransitionManager::GetTransitionTree(const std::shared_ptr& a, const std::shared_ptr& b) const { return CTreeUtils::GetTransitionTree(a, b, x0_animCtx); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CTransitionManager.hpp b/Runtime/Character/CTransitionManager.hpp index d5466bdd5..682ea607f 100644 --- a/Runtime/Character/CTransitionManager.hpp +++ b/Runtime/Character/CTransitionManager.hpp @@ -6,7 +6,7 @@ #include "Runtime/Character/CAnimSysContext.hpp" #include "Runtime/Character/CTransitionDatabaseGame.hpp" -namespace urde { +namespace metaforce { class CAnimTreeNode; class CRandom16; class CSimplePool; @@ -20,4 +20,4 @@ public: const std::shared_ptr& b) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CTreeUtils.cpp b/Runtime/Character/CTreeUtils.cpp index 8c64f0d4d..c87c1eb90 100644 --- a/Runtime/Character/CTreeUtils.cpp +++ b/Runtime/Character/CTreeUtils.cpp @@ -5,7 +5,7 @@ #include "Runtime/Character/CTransitionDatabaseGame.hpp" #include "Runtime/Character/IMetaTrans.hpp" -namespace urde { +namespace metaforce { std::shared_ptr CTreeUtils::GetTransitionTree(const std::weak_ptr& a, const std::weak_ptr& b, @@ -16,4 +16,4 @@ std::shared_ptr CTreeUtils::GetTransitionTree(const std::weak_ptr ->GetTransitionTree(a, b, animCtx); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CTreeUtils.hpp b/Runtime/Character/CTreeUtils.hpp index 9397c51d7..11428694c 100644 --- a/Runtime/Character/CTreeUtils.hpp +++ b/Runtime/Character/CTreeUtils.hpp @@ -4,7 +4,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CAnimTreeNode; struct CAnimSysContext; @@ -15,4 +15,4 @@ public: const CAnimSysContext& animCtx); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/CharacterCommon.hpp b/Runtime/Character/CharacterCommon.hpp index 47f5d23d9..0ccb8674d 100644 --- a/Runtime/Character/CharacterCommon.hpp +++ b/Runtime/Character/CharacterCommon.hpp @@ -1,6 +1,6 @@ #pragma once -namespace urde { +namespace metaforce { namespace pas { enum class ELocomotionType { Invalid = -1, @@ -156,4 +156,4 @@ enum class EBodyStateCmd { StopReaction }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/IAnimReader.cpp b/Runtime/Character/IAnimReader.cpp index fcb5f8009..8b212b567 100644 --- a/Runtime/Character/IAnimReader.cpp +++ b/Runtime/Character/IAnimReader.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CCharAnimTime.hpp" -namespace urde { +namespace metaforce { SAdvancementDeltas SAdvancementDeltas::Interpolate(const SAdvancementDeltas& a, const SAdvancementDeltas& b, float oldWeight, float newWeight) { @@ -54,4 +54,4 @@ size_t IAnimReader::GetSoundPOIList(const CCharAnimTime& time, CSoundPOINode* li return 0; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/IAnimReader.hpp b/Runtime/Character/IAnimReader.hpp index eb005e741..6988d90a0 100644 --- a/Runtime/Character/IAnimReader.hpp +++ b/Runtime/Character/IAnimReader.hpp @@ -13,7 +13,7 @@ #include #include -namespace urde { +namespace metaforce { class CBoolPOINode; class CInt32POINode; class CParticlePOINode; @@ -146,4 +146,4 @@ public: std::unique_ptr Clone() const { return VClone(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/IMetaAnim.cpp b/Runtime/Character/IMetaAnim.cpp index 58a350985..1b45a5626 100644 --- a/Runtime/Character/IMetaAnim.cpp +++ b/Runtime/Character/IMetaAnim.cpp @@ -7,7 +7,7 @@ #include "Runtime/Character/CCharAnimTime.hpp" #include "Runtime/Character/IAnimReader.hpp" -namespace urde { +namespace metaforce { std::shared_ptr IMetaAnim::GetAnimationTree(const CAnimSysContext& animSys, const CMetaAnimTreeBuildOrders& orders) const { @@ -50,4 +50,4 @@ CCharAnimTime IMetaAnim::GetTime(const CPreAdvanceIndicator& ind, const IAnimRea return {}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/IMetaAnim.hpp b/Runtime/Character/IMetaAnim.hpp index c941dafc5..7313bc6ff 100644 --- a/Runtime/Character/IMetaAnim.hpp +++ b/Runtime/Character/IMetaAnim.hpp @@ -7,7 +7,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Character/CCharAnimTime.hpp" -namespace urde { +namespace metaforce { class CAnimTreeNode; class CPrimitive; class IAnimReader; @@ -68,4 +68,4 @@ public: static CCharAnimTime GetTime(const CPreAdvanceIndicator& ind, const IAnimReader& anim); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/IMetaTrans.hpp b/Runtime/Character/IMetaTrans.hpp index 862e2564f..c23033000 100644 --- a/Runtime/Character/IMetaTrans.hpp +++ b/Runtime/Character/IMetaTrans.hpp @@ -4,7 +4,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CAnimTreeNode; struct CAnimSysContext; @@ -25,4 +25,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/IVaryingAnimationTimeScale.hpp b/Runtime/Character/IVaryingAnimationTimeScale.hpp index aea324e67..8cdb96ec1 100644 --- a/Runtime/Character/IVaryingAnimationTimeScale.hpp +++ b/Runtime/Character/IVaryingAnimationTimeScale.hpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CCharAnimTime.hpp" -namespace urde { +namespace metaforce { class IVaryingAnimationTimeScale { public: virtual ~IVaryingAnimationTimeScale() = default; @@ -21,4 +21,4 @@ public: std::unique_ptr Clone() const { return VClone(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Character/TSegIdMap.hpp b/Runtime/Character/TSegIdMap.hpp index f52c66730..1f0e5255d 100644 --- a/Runtime/Character/TSegIdMap.hpp +++ b/Runtime/Character/TSegIdMap.hpp @@ -6,7 +6,7 @@ #include "Runtime/Character/CSegId.hpp" -namespace urde { +namespace metaforce { template class TSegIdMap { @@ -72,4 +72,4 @@ public: u32 GetCapacity() const { return x1_capacity; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CAABoxFilter.cpp b/Runtime/Collision/CAABoxFilter.cpp index 77583c3b1..fd9652eda 100644 --- a/Runtime/Collision/CAABoxFilter.cpp +++ b/Runtime/Collision/CAABoxFilter.cpp @@ -3,7 +3,7 @@ #include "Runtime/Collision/CCollisionInfoList.hpp" #include "Runtime/Collision/CollisionUtil.hpp" -namespace urde { +namespace metaforce { void CAABoxFilter::Filter(const CCollisionInfoList& in, CCollisionInfoList& out) const { FilterBoxFloorCollisions(in, out); @@ -27,4 +27,4 @@ void CAABoxFilter::FilterBoxFloorCollisions(const CCollisionInfoList& in, CColli CollisionUtil::AddAverageToFront(temp, out); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CAABoxFilter.hpp b/Runtime/Collision/CAABoxFilter.hpp index 59e5c92c6..d5e0d1686 100644 --- a/Runtime/Collision/CAABoxFilter.hpp +++ b/Runtime/Collision/CAABoxFilter.hpp @@ -2,7 +2,7 @@ #include "Runtime/Collision/ICollisionFilter.hpp" -namespace urde { +namespace metaforce { class CCollisionInfoList; class CAABoxFilter : public ICollisionFilter { @@ -12,4 +12,4 @@ public: static void FilterBoxFloorCollisions(const CCollisionInfoList& in, CCollisionInfoList& out); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CAreaOctTree.cpp b/Runtime/Collision/CAreaOctTree.cpp index 38dd381e3..045dd4081 100644 --- a/Runtime/Collision/CAreaOctTree.cpp +++ b/Runtime/Collision/CAreaOctTree.cpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { static bool _close_enough(float f1, float f2, float epsilon) { return std::fabs(f1 - f2) <= epsilon; } @@ -620,4 +620,4 @@ void CAreaOctTree::GetTriangleVertexIndices(u16 idx, u16 indicesOut[3]) const { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CAreaOctTree.hpp b/Runtime/Collision/CAreaOctTree.hpp index a1c2b57ea..359f1a9be 100644 --- a/Runtime/Collision/CAreaOctTree.hpp +++ b/Runtime/Collision/CAreaOctTree.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CMaterialFilter; class CAreaOctTree { friend class CBooRenderer; @@ -116,4 +116,4 @@ public: static std::unique_ptr MakeFromMemory(const u8* buf, unsigned int size); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CBallFilter.cpp b/Runtime/Collision/CBallFilter.cpp index 6067547cf..d364bc8a0 100644 --- a/Runtime/Collision/CBallFilter.cpp +++ b/Runtime/Collision/CBallFilter.cpp @@ -1,10 +1,10 @@ #include "Runtime/Collision/CBallFilter.hpp" #include "Runtime/Collision/CollisionUtil.hpp" -namespace urde { +namespace metaforce { void CBallFilter::Filter(const CCollisionInfoList& in, CCollisionInfoList& out) const { CollisionUtil::AddAverageToFront(in, out); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CBallFilter.hpp b/Runtime/Collision/CBallFilter.hpp index 7ba532a03..6b25e47df 100644 --- a/Runtime/Collision/CBallFilter.hpp +++ b/Runtime/Collision/CBallFilter.hpp @@ -2,7 +2,7 @@ #include "Runtime/Collision/ICollisionFilter.hpp" -namespace urde { +namespace metaforce { class CCollisionInfoList; class CPhysicsActor; @@ -12,4 +12,4 @@ public: void Filter(const CCollisionInfoList& in, CCollisionInfoList& out) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollidableAABox.cpp b/Runtime/Collision/CCollidableAABox.cpp index 1841c95fe..17775844d 100644 --- a/Runtime/Collision/CCollidableAABox.cpp +++ b/Runtime/Collision/CCollidableAABox.cpp @@ -5,7 +5,7 @@ #include "Runtime/Collision/CInternalRayCastStructure.hpp" #include "Runtime/Collision/CollisionUtil.hpp" -namespace urde { +namespace metaforce { constexpr CCollisionPrimitive::Type sType(CCollidableAABox::SetStaticTableIndex, "CCollidableAABox"); CCollidableAABox::CCollidableAABox() = default; @@ -112,4 +112,4 @@ bool AABox_AABox_Bool(const CInternalCollisionStructure& collision) { } } // namespace Collide -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollidableAABox.hpp b/Runtime/Collision/CCollidableAABox.hpp index 4714bc7f2..d4f7c123f 100644 --- a/Runtime/Collision/CCollidableAABox.hpp +++ b/Runtime/Collision/CCollidableAABox.hpp @@ -5,7 +5,7 @@ #include -namespace urde { +namespace metaforce { namespace Collide { bool AABox_AABox(const CInternalCollisionStructure&, CCollisionInfoList&); bool AABox_AABox_Bool(const CInternalCollisionStructure&); @@ -35,4 +35,4 @@ public: static bool CollideMovingAABox(const CInternalCollisionStructure&, const zeus::CVector3f&, double&, CCollisionInfo&); static bool CollideMovingSphere(const CInternalCollisionStructure&, const zeus::CVector3f&, double&, CCollisionInfo&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollidableCollisionSurface.cpp b/Runtime/Collision/CCollidableCollisionSurface.cpp index ef55b3f03..3c853124b 100644 --- a/Runtime/Collision/CCollidableCollisionSurface.cpp +++ b/Runtime/Collision/CCollidableCollisionSurface.cpp @@ -1,10 +1,10 @@ #include "Runtime/Collision/CCollidableCollisionSurface.hpp" -namespace urde { +namespace metaforce { constexpr CCollisionPrimitive::Type sType(CCollidableCollisionSurface::SetStaticTableIndex, "CCollidableCollisionSurface"); const CCollisionPrimitive::Type& CCollidableCollisionSurface::GetType() { return sType; } void CCollidableCollisionSurface::SetStaticTableIndex(u32 index) { sTableIndex = index; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollidableCollisionSurface.hpp b/Runtime/Collision/CCollidableCollisionSurface.hpp index e4ec95ba4..da5f49115 100644 --- a/Runtime/Collision/CCollidableCollisionSurface.hpp +++ b/Runtime/Collision/CCollidableCollisionSurface.hpp @@ -3,7 +3,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/Collision/CCollisionPrimitive.hpp" -namespace urde { +namespace metaforce { class CCollidableCollisionSurface { static inline u32 sTableIndex = UINT32_MAX; @@ -11,4 +11,4 @@ public: static const CCollisionPrimitive::Type& GetType(); static void SetStaticTableIndex(u32 index); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollidableOBBTree.cpp b/Runtime/Collision/CCollidableOBBTree.cpp index 2e3c9b012..ff224bfe0 100644 --- a/Runtime/Collision/CCollidableOBBTree.cpp +++ b/Runtime/Collision/CCollidableOBBTree.cpp @@ -7,9 +7,9 @@ #include "Runtime/Collision/CMaterialFilter.hpp" #include "Runtime/Collision/CollisionUtil.hpp" -namespace urde { +namespace metaforce { -CCollidableOBBTree::CCollidableOBBTree(const COBBTree* tree, const urde::CMaterialList& material) +CCollidableOBBTree::CCollidableOBBTree(const COBBTree* tree, const metaforce::CMaterialList& material) : CCollisionPrimitive(material), x10_tree(tree) {} bool CCollidableOBBTree::LineIntersectsLeaf(const COBBTree::CLeafData& leaf, CRayCastInfo& info) const { @@ -570,4 +570,4 @@ zeus::CAABox CCollidableOBBTree::CalculateAABox(const zeus::CTransform& xf) cons zeus::CAABox CCollidableOBBTree::CalculateLocalAABox() const { return x10_tree->CalculateLocalAABox(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollidableOBBTree.hpp b/Runtime/Collision/CCollidableOBBTree.hpp index 735919753..014c81141 100644 --- a/Runtime/Collision/CCollidableOBBTree.hpp +++ b/Runtime/Collision/CCollidableOBBTree.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class CRayCastInfo { const zeus::CMRay& x0_ray; const CMaterialFilter& x4_filter; @@ -86,4 +86,4 @@ public: CRayCastResult CastRayInternal(const CInternalRayCastStructure&) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollidableOBBTreeGroup.cpp b/Runtime/Collision/CCollidableOBBTreeGroup.cpp index 12e2ba331..6e9a41804 100644 --- a/Runtime/Collision/CCollidableOBBTreeGroup.cpp +++ b/Runtime/Collision/CCollidableOBBTreeGroup.cpp @@ -7,7 +7,7 @@ #include "Runtime/Collision/CInternalRayCastStructure.hpp" #include "Runtime/Collision/CollisionUtil.hpp" -namespace urde { +namespace metaforce { constexpr CCollisionPrimitive::Type sType(CCollidableOBBTreeGroup::SetStaticTableIndex, "CCollidableOBBTreeGroup"); CCollidableOBBTreeGroupContainer::CCollidableOBBTreeGroupContainer(CInputStream& in) { @@ -229,4 +229,4 @@ CFactoryFnReturn FCollidableOBBTreeGroupFactory(const SObjectTag& tag, CInputStr std::make_unique(in)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollidableOBBTreeGroup.hpp b/Runtime/Collision/CCollidableOBBTreeGroup.hpp index 24e0e0670..c60e44b1a 100644 --- a/Runtime/Collision/CCollidableOBBTreeGroup.hpp +++ b/Runtime/Collision/CCollidableOBBTreeGroup.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CCollidableOBBTreeGroupContainer { friend class CCollidableOBBTreeGroup; std::vector> x0_trees; @@ -52,4 +52,4 @@ public: CFactoryFnReturn FCollidableOBBTreeGroupFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollidableSphere.cpp b/Runtime/Collision/CCollidableSphere.cpp index ae48d7df3..559d866d9 100644 --- a/Runtime/Collision/CCollidableSphere.cpp +++ b/Runtime/Collision/CCollidableSphere.cpp @@ -5,7 +5,7 @@ #include "Runtime/Collision/CInternalRayCastStructure.hpp" #include "Runtime/Collision/CollisionUtil.hpp" -namespace urde { +namespace metaforce { constexpr CCollisionPrimitive::Type sType(CCollidableSphere::SetStaticTableIndex, "CCollidableSphere"); namespace Collide { @@ -281,4 +281,4 @@ bool CCollidableSphere::Sphere_AABox_Bool(const zeus::CSphere& sphere, const zeu return mag <= sphere.radius * sphere.radius; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollidableSphere.hpp b/Runtime/Collision/CCollidableSphere.hpp index cb0b3f5e7..5415e5e0f 100644 --- a/Runtime/Collision/CCollidableSphere.hpp +++ b/Runtime/Collision/CCollidableSphere.hpp @@ -5,7 +5,7 @@ #include #include -namespace urde { +namespace metaforce { namespace Collide { bool Sphere_AABox(const CInternalCollisionStructure&, CCollisionInfoList&); bool Sphere_AABox_Bool(const CInternalCollisionStructure&); @@ -38,4 +38,4 @@ public: static bool CollideMovingSphere(const CInternalCollisionStructure&, const zeus::CVector3f&, double&, CCollisionInfo&); static bool Sphere_AABox_Bool(const zeus::CSphere& sphere, const zeus::CAABox& aabb); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionActor.cpp b/Runtime/Collision/CCollisionActor.cpp index c6c23fa85..b8f78939d 100644 --- a/Runtime/Collision/CCollisionActor.cpp +++ b/Runtime/Collision/CCollisionActor.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { constexpr CMaterialList skDefaultCollisionActorMaterials = CMaterialList(EMaterialTypes::Solid, EMaterialTypes::CollisionActor, EMaterialTypes::ScanPassthrough, EMaterialTypes::CameraPassthrough); @@ -192,4 +192,4 @@ void CCollisionActor::DebugDraw() { col.a() = 0.5f; m_aabox.draw(col); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionActor.hpp b/Runtime/Collision/CCollisionActor.hpp index cbd887d45..a108688f4 100644 --- a/Runtime/Collision/CCollisionActor.hpp +++ b/Runtime/Collision/CCollisionActor.hpp @@ -10,7 +10,7 @@ #include -namespace urde { +namespace metaforce { class CCollidableSphere; class CCollidableOBBTreeGroup; class CCollidableOBBTreeGroupContainer; @@ -69,4 +69,4 @@ public: void SetSphereRadius(float radius); float GetSphereRadius() const { return x288_sphereRadius; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionActorManager.cpp b/Runtime/Collision/CCollisionActorManager.cpp index 81b8b6d35..29ec16f51 100644 --- a/Runtime/Collision/CCollisionActorManager.cpp +++ b/Runtime/Collision/CCollisionActorManager.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CCollisionActorManager::CCollisionActorManager(CStateManager& mgr, TUniqueId owner, TAreaId area, const std::vector& descs, bool active) @@ -246,4 +246,4 @@ std::optional CCollisionActorManager::GetDeviation(const CState return std::nullopt; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionActorManager.hpp b/Runtime/Collision/CCollisionActorManager.hpp index 158632851..51e69d1eb 100644 --- a/Runtime/Collision/CCollisionActorManager.hpp +++ b/Runtime/Collision/CCollisionActorManager.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CAnimData; class CCollisionActor; class CMaterialList; @@ -43,4 +43,4 @@ public: static zeus::CTransform GetWRLocatorTransform(const CAnimData& animData, CSegId id, const zeus::CTransform& worldXf, const zeus::CTransform& localXf); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionEdge.cpp b/Runtime/Collision/CCollisionEdge.cpp index 4ec1b6932..d7733136b 100644 --- a/Runtime/Collision/CCollisionEdge.cpp +++ b/Runtime/Collision/CCollisionEdge.cpp @@ -1,8 +1,8 @@ #include "Runtime/Collision/CCollisionEdge.hpp" -namespace urde { +namespace metaforce { CCollisionEdge::CCollisionEdge(CInputStream& in) { x0_index1 = in.readUint16Big(); x2_index2 = in.readUint16Big(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionEdge.hpp b/Runtime/Collision/CCollisionEdge.hpp index 7c976a058..10d9e90e3 100644 --- a/Runtime/Collision/CCollisionEdge.hpp +++ b/Runtime/Collision/CCollisionEdge.hpp @@ -2,7 +2,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CCollisionEdge { u16 x0_index1 = -1; u16 x2_index2 = -1; @@ -20,4 +20,4 @@ public: x2_index2 = hecl::SBig(x2_index2); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionInfo.cpp b/Runtime/Collision/CCollisionInfo.cpp index 20ab3b27e..d89743d54 100644 --- a/Runtime/Collision/CCollisionInfo.cpp +++ b/Runtime/Collision/CCollisionInfo.cpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { CCollisionInfo CCollisionInfo::GetSwapped() const { CCollisionInfo ret; @@ -25,4 +25,4 @@ void CCollisionInfo::Swap() { zeus::CVector3f CCollisionInfo::GetExtreme() const { return x0_point + xc_extentX + x18_extentY + x24_extentZ; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionInfo.hpp b/Runtime/Collision/CCollisionInfo.hpp index cb8e83bf9..5a290e071 100644 --- a/Runtime/Collision/CCollisionInfo.hpp +++ b/Runtime/Collision/CCollisionInfo.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CCollisionInfo { friend class CCollisionInfoList; @@ -66,4 +66,4 @@ public: const zeus::CVector3f& GetPoint() const { return x0_point; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionInfoList.hpp b/Runtime/Collision/CCollisionInfoList.hpp index 4216f3158..75c3f0a48 100644 --- a/Runtime/Collision/CCollisionInfoList.hpp +++ b/Runtime/Collision/CCollisionInfoList.hpp @@ -4,7 +4,7 @@ #include "Runtime/rstl.hpp" #include "Runtime/Collision/CCollisionInfo.hpp" -namespace urde { +namespace metaforce { class CCollisionInfoList { rstl::reserved_vector x0_list; @@ -89,4 +89,4 @@ public: } } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionPrimitive.cpp b/Runtime/Collision/CCollisionPrimitive.cpp index 139d1e560..8a0d65812 100644 --- a/Runtime/Collision/CCollisionPrimitive.cpp +++ b/Runtime/Collision/CCollisionPrimitive.cpp @@ -10,7 +10,7 @@ #include "Runtime/Collision/CMaterialFilter.hpp" #include "Runtime/Collision/InternalColliders.hpp" -namespace urde { +namespace metaforce { s32 CCollisionPrimitive::sNumTypes = 0; bool CCollisionPrimitive::sInitComplete = false; bool CCollisionPrimitive::sTypesAdded = false; @@ -265,4 +265,4 @@ void CCollisionPrimitive::Uninitialize() { sTableOfBooleanCollidables.reset(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionPrimitive.hpp b/Runtime/Collision/CCollisionPrimitive.hpp index bbe619908..63cbebf2f 100644 --- a/Runtime/Collision/CCollisionPrimitive.hpp +++ b/Runtime/Collision/CCollisionPrimitive.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CCollisionPrimitive; class CMaterialFilter; @@ -169,4 +169,4 @@ public: static void Uninitialize(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionResponseData.cpp b/Runtime/Collision/CCollisionResponseData.cpp index 20b25204b..e99c8fbc1 100644 --- a/Runtime/Collision/CCollisionResponseData.cpp +++ b/Runtime/Collision/CCollisionResponseData.cpp @@ -11,7 +11,7 @@ #include "Runtime/Particle/CParticleDataFactory.hpp" #include "Runtime/Particle/CSwooshDescription.hpp" -namespace urde { +namespace metaforce { namespace { constexpr std::array skWorldMaterialTable{ EWeaponCollisionResponseTypes::Default, EWeaponCollisionResponseTypes::Unknown2, @@ -253,4 +253,4 @@ CFactoryFnReturn FCollisionResponseDataFactory(const SObjectTag& tag, CInputStre CSimplePool* sp = vparms.GetOwnedObj(); return TToken::GetIObjObjectFor(std::make_unique(in, sp)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionResponseData.hpp b/Runtime/Collision/CCollisionResponseData.hpp index 4b61ca6d4..351f367c4 100644 --- a/Runtime/Collision/CCollisionResponseData.hpp +++ b/Runtime/Collision/CCollisionResponseData.hpp @@ -11,7 +11,7 @@ #include "Runtime/Collision/CMaterialList.hpp" #include "Runtime/Particle/CDecalDescription.hpp" -namespace urde { +namespace metaforce { class CGenDescription; class CSimplePool; @@ -141,4 +141,4 @@ public: CFactoryFnReturn FCollisionResponseDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionSurface.cpp b/Runtime/Collision/CCollisionSurface.cpp index f1b48e350..791d1f400 100644 --- a/Runtime/Collision/CCollisionSurface.cpp +++ b/Runtime/Collision/CCollisionSurface.cpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { CCollisionSurface::CCollisionSurface(const zeus::CVector3f& a, const zeus::CVector3f& b, const zeus::CVector3f& c, u32 flags) : x0_data{a, b, c}, x24_flags(flags) {} @@ -17,4 +17,4 @@ zeus::CPlane CCollisionSurface::GetPlane() const { return {norm, norm.dot(x0_data[0])}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CCollisionSurface.hpp b/Runtime/Collision/CCollisionSurface.hpp index ea7a6ce50..7fa139b08 100644 --- a/Runtime/Collision/CCollisionSurface.hpp +++ b/Runtime/Collision/CCollisionSurface.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CCollisionSurface { public: using Vertices = std::array; @@ -25,4 +25,4 @@ public: zeus::CPlane GetPlane() const; u32 GetSurfaceFlags() const { return x24_flags; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CGameCollision.cpp b/Runtime/Collision/CGameCollision.cpp index 068e73cd4..7f1902999 100644 --- a/Runtime/Collision/CGameCollision.cpp +++ b/Runtime/Collision/CGameCollision.cpp @@ -17,7 +17,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { static float CollisionImpulseFiniteVsInfinite(float mass, float velNormDot, float restitution) { return mass * -(1.f + restitution) * velNormDot; @@ -1034,4 +1034,4 @@ void CGameCollision::AvoidStaticCollisionWithinRadius(const CStateManager& mgr, actor.SetVelocityWR(actor.GetVelocity() + (dt * (mass * velocity))); } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CGameCollision.hpp b/Runtime/Collision/CGameCollision.hpp index d03f604e7..ec7e91a81 100644 --- a/Runtime/Collision/CGameCollision.hpp +++ b/Runtime/Collision/CGameCollision.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CActor; class CCollisionInfo; @@ -125,4 +125,4 @@ public: static void AvoidStaticCollisionWithinRadius(const CStateManager& mgr, CPhysicsActor& actor, u32 iterations, float dt, float height, float size, float mass, float radius); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CInternalRayCastStructure.hpp b/Runtime/Collision/CInternalRayCastStructure.hpp index e08e5170e..84848d292 100644 --- a/Runtime/Collision/CInternalRayCastStructure.hpp +++ b/Runtime/Collision/CInternalRayCastStructure.hpp @@ -6,7 +6,7 @@ #include #include -namespace urde { +namespace metaforce { class CInternalRayCastStructure { zeus::CMRay x0_ray; float x38_maxTime; @@ -25,4 +25,4 @@ public: const zeus::CTransform& GetTransform() const { return x3c_xf; } const CMaterialFilter& GetFilter() const { return x6c_filter; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CJointCollisionDescription.cpp b/Runtime/Collision/CJointCollisionDescription.cpp index cbba49cc2..a04da6da4 100644 --- a/Runtime/Collision/CJointCollisionDescription.cpp +++ b/Runtime/Collision/CJointCollisionDescription.cpp @@ -1,6 +1,6 @@ #include "Runtime/Collision/CJointCollisionDescription.hpp" -namespace urde { +namespace metaforce { CJointCollisionDescription::CJointCollisionDescription(ECollisionType colType, CSegId pivotId, CSegId nextId, const zeus::CVector3f& bounds, const zeus::CVector3f& pivotPoint, @@ -58,4 +58,4 @@ void CJointCollisionDescription::ScaleAllBounds(const zeus::CVector3f& scale) { x28_maxSeparation *= scale.x(); x18_pivotPoint *= scale; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CJointCollisionDescription.hpp b/Runtime/Collision/CJointCollisionDescription.hpp index 2410ccdca..f2cb954a5 100644 --- a/Runtime/Collision/CJointCollisionDescription.hpp +++ b/Runtime/Collision/CJointCollisionDescription.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { struct SJointInfo { const char* from; const char* to; @@ -89,4 +89,4 @@ public: CSegId GetPivotId() const { return x8_pivotId; } void ScaleAllBounds(const zeus::CVector3f& scale); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CMaterialFilter.cpp b/Runtime/Collision/CMaterialFilter.cpp index ddd9b9dfa..475387ca3 100644 --- a/Runtime/Collision/CMaterialFilter.cpp +++ b/Runtime/Collision/CMaterialFilter.cpp @@ -1,5 +1,5 @@ #include "Runtime/Collision/CMaterialFilter.hpp" -namespace urde { +namespace metaforce { const CMaterialFilter CMaterialFilter::skPassEverything({0x00000000FFFFFFFF}, {0}, EFilterType::Always); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CMaterialFilter.hpp b/Runtime/Collision/CMaterialFilter.hpp index 32c521f2c..13fa2d52a 100644 --- a/Runtime/Collision/CMaterialFilter.hpp +++ b/Runtime/Collision/CMaterialFilter.hpp @@ -2,7 +2,7 @@ #include "Runtime/Collision/CMaterialList.hpp" -namespace urde { +namespace metaforce { class CMaterialFilter { public: enum class EFilterType { Always, Include, Exclude, IncludeExclude }; @@ -56,4 +56,4 @@ public: } } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CMaterialList.hpp b/Runtime/Collision/CMaterialList.hpp index df798a8ea..12684a67b 100644 --- a/Runtime/Collision/CMaterialList.hpp +++ b/Runtime/Collision/CMaterialList.hpp @@ -2,7 +2,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { enum class EMaterialTypes { NoStepLogic = 0, Stone = 1, @@ -137,4 +137,4 @@ public: void Union(const CMaterialList& other) noexcept { x0_list |= other.x0_list; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CMetroidAreaCollider.cpp b/Runtime/Collision/CMetroidAreaCollider.cpp index 089433d28..ba90f2ddc 100644 --- a/Runtime/Collision/CMetroidAreaCollider.cpp +++ b/Runtime/Collision/CMetroidAreaCollider.cpp @@ -4,7 +4,7 @@ #include "Runtime/Collision/CMaterialFilter.hpp" #include "Runtime/Collision/CollisionUtil.hpp" -namespace urde { +namespace metaforce { u32 CMetroidAreaCollider::g_CalledClip = 0; u32 CMetroidAreaCollider::g_RejectedByClip = 0; @@ -951,4 +951,4 @@ void CAreaCollisionCache::AddOctreeLeafCache(const CMetroidAreaCollider::COctree } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CMetroidAreaCollider.hpp b/Runtime/Collision/CMetroidAreaCollider.hpp index 08a1fc10c..57803fcaf 100644 --- a/Runtime/Collision/CMetroidAreaCollider.hpp +++ b/Runtime/Collision/CMetroidAreaCollider.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CCollisionInfo; class CCollisionInfoList; class CMaterialList; @@ -191,4 +191,4 @@ public: { return x18_leafCaches.end(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/COBBTree.cpp b/Runtime/Collision/COBBTree.cpp index 2849ca96f..7eee3d37b 100644 --- a/Runtime/Collision/COBBTree.cpp +++ b/Runtime/Collision/COBBTree.cpp @@ -4,7 +4,7 @@ #include "Runtime/Collision/CCollidableOBBTreeGroup.hpp" -namespace urde { +namespace metaforce { namespace { constexpr std::array DefaultEdgeMaterials{ 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 2, 0, 0, 2, 0, 0, 2, 2, @@ -244,4 +244,4 @@ COBBTree::CLeafData::CLeafData(CInputStream& in) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/COBBTree.hpp b/Runtime/Collision/COBBTree.hpp index 58ef0ec4d..2d14c5883 100644 --- a/Runtime/Collision/COBBTree.hpp +++ b/Runtime/Collision/COBBTree.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CCollidableOBBTreeGroupContainer; class COBBTree { @@ -93,4 +93,4 @@ public: zeus::CAABox CalculateAABox(const zeus::CTransform&) const; const CNode& GetRoot() const { return *x88_root; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CRayCastResult.cpp b/Runtime/Collision/CRayCastResult.cpp index cad892038..3ec63466a 100644 --- a/Runtime/Collision/CRayCastResult.cpp +++ b/Runtime/Collision/CRayCastResult.cpp @@ -1,6 +1,6 @@ #include "Runtime/Collision/CRayCastResult.hpp" -namespace urde { +namespace metaforce { void CRayCastResult::MakeInvalid() { /* NOTE: CRayCastResult: Enable this if it's required, this is a total guess - Phil */ @@ -19,4 +19,4 @@ void CRayCastResult::Transform(const zeus::CTransform& xf) { x10_plane = zeus::CPlane(xf.rotate(x10_plane.normal()), x10_plane.normal().dot(x4_point)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CRayCastResult.hpp b/Runtime/Collision/CRayCastResult.hpp index cabd64655..839b70154 100644 --- a/Runtime/Collision/CRayCastResult.hpp +++ b/Runtime/Collision/CRayCastResult.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CRayCastResult { public: enum class EInvalid : u8 { Invalid, Valid }; @@ -42,4 +42,4 @@ public: void Transform(const zeus::CTransform&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/CollisionUtil.cpp b/Runtime/Collision/CollisionUtil.cpp index f81259b98..89736c31e 100644 --- a/Runtime/Collision/CollisionUtil.cpp +++ b/Runtime/Collision/CollisionUtil.cpp @@ -9,7 +9,7 @@ #include -namespace urde::CollisionUtil { +namespace metaforce::CollisionUtil { bool LineIntersectsOBBox(const zeus::COBBox& obb, const zeus::CMRay& ray, float& d) { zeus::CVector3f norm; return RayAABoxIntersection(ray.getInvUnscaledTransformRay(obb.transform), {-obb.extents, obb.extents}, norm, d); @@ -1185,4 +1185,4 @@ void AddAverageToFront(const CCollisionInfoList& in, CCollisionInfoList& out) { out.Add(info, false); } } -} // namespace urde::CollisionUtil +} // namespace metaforce::CollisionUtil diff --git a/Runtime/Collision/CollisionUtil.hpp b/Runtime/Collision/CollisionUtil.hpp index a0c4f179a..79a6e53f8 100644 --- a/Runtime/Collision/CollisionUtil.hpp +++ b/Runtime/Collision/CollisionUtil.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CCollisionInfoList; namespace CollisionUtil { bool LineIntersectsOBBox(const zeus::COBBox&, const zeus::CMRay&, float&); @@ -47,4 +47,4 @@ bool AABox_AABox_Moving(const zeus::CAABox& aabb0, const zeus::CAABox& aabb1, co zeus::CVector3f& point, zeus::CVector3f& normal); void AddAverageToFront(const CCollisionInfoList& in, CCollisionInfoList& out); } // namespace CollisionUtil -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/ICollisionFilter.hpp b/Runtime/Collision/ICollisionFilter.hpp index e0a7a0d53..afd6dff35 100644 --- a/Runtime/Collision/ICollisionFilter.hpp +++ b/Runtime/Collision/ICollisionFilter.hpp @@ -1,6 +1,6 @@ #pragma once -namespace urde { +namespace metaforce { class CActor; class CCollisionInfoList; @@ -15,4 +15,4 @@ public: virtual void Filter(const CCollisionInfoList& in, CCollisionInfoList& out) const = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Collision/InternalColliders.cpp b/Runtime/Collision/InternalColliders.cpp index f1abdeb6b..1bf8b3f01 100644 --- a/Runtime/Collision/InternalColliders.cpp +++ b/Runtime/Collision/InternalColliders.cpp @@ -4,7 +4,7 @@ #include "Runtime/Collision/CCollidableCollisionSurface.hpp" #include "Runtime/Collision/CCollidableSphere.hpp" -namespace urde::InternalColliders { +namespace metaforce::InternalColliders { void AddTypes() { CCollisionPrimitive::InitAddType(CCollidableAABox::GetType()); CCollisionPrimitive::InitAddType(CCollidableCollisionSurface::GetType()); @@ -27,4 +27,4 @@ void AddColliders() { CCollisionPrimitive::InitAddMovingCollider(CCollidableSphere::CollideMovingSphere, "CCollidableSphere", "CCollidableSphere"); } -} // namespace urde::InternalColliders +} // namespace metaforce::InternalColliders diff --git a/Runtime/Collision/InternalColliders.hpp b/Runtime/Collision/InternalColliders.hpp index 305a13645..fa43c8070 100644 --- a/Runtime/Collision/InternalColliders.hpp +++ b/Runtime/Collision/InternalColliders.hpp @@ -1,6 +1,6 @@ #pragma once -namespace urde::InternalColliders { +namespace metaforce::InternalColliders { void AddTypes(); void AddColliders(); -} // namespace urde::InternalColliders +} // namespace metaforce::InternalColliders diff --git a/Runtime/GameGlobalObjects.cpp b/Runtime/GameGlobalObjects.cpp index e1940f8c3..e0d532eb5 100644 --- a/Runtime/GameGlobalObjects.cpp +++ b/Runtime/GameGlobalObjects.cpp @@ -1,6 +1,6 @@ #include "Runtime/GameGlobalObjects.hpp" -namespace urde { +namespace metaforce { namespace MP1 { class CGameArchitectureSupport* g_archSupport = nullptr; } @@ -35,4 +35,4 @@ ITweakParticle* g_tweakParticle = nullptr; ITweakBall* g_tweakBall = nullptr; ITweakGuiColors* g_tweakGuiColors = nullptr; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GameGlobalObjects.hpp b/Runtime/GameGlobalObjects.hpp index 5ddcf4c4b..7902647aa 100644 --- a/Runtime/GameGlobalObjects.hpp +++ b/Runtime/GameGlobalObjects.hpp @@ -36,7 +36,7 @@ #include "Runtime/CTextureCache.hpp" -namespace urde { +namespace metaforce { extern class IMain* g_Main; namespace MP1 { extern class CGameArchitectureSupport* g_archSupport; @@ -98,4 +98,4 @@ extern ITweakParticle* g_tweakParticle; extern ITweakBall* g_tweakBall; extern ITweakGuiColors* g_tweakGuiColors; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GameObjectLists.cpp b/Runtime/GameObjectLists.cpp index 024cbc7ed..80b56f0e5 100644 --- a/Runtime/GameObjectLists.cpp +++ b/Runtime/GameObjectLists.cpp @@ -10,7 +10,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CActorList::CActorList() : CObjectList(EGameObjectList::Actor) {} @@ -51,4 +51,4 @@ CGameLightList::CGameLightList() : CObjectList(EGameObjectList::GameLight) {} bool CGameLightList::IsQualified(const CEntity& lt) const { return TCastToConstPtr(lt).IsValid(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GameObjectLists.hpp b/Runtime/GameObjectLists.hpp index 2c23e5f4f..5bf8e54be 100644 --- a/Runtime/GameObjectLists.hpp +++ b/Runtime/GameObjectLists.hpp @@ -2,7 +2,7 @@ #include "Runtime/CObjectList.hpp" -namespace urde { +namespace metaforce { class CActorList : public CObjectList { public: @@ -51,4 +51,4 @@ public: bool IsQualified(const CEntity&) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CBooRenderer.cpp b/Runtime/Graphics/CBooRenderer.cpp index edf424ea4..1e846bd8f 100644 --- a/Runtime/Graphics/CBooRenderer.cpp +++ b/Runtime/Graphics/CBooRenderer.cpp @@ -27,7 +27,7 @@ #define FOGVOL_NEAR 0.2 #define SPHERE_RAMP_RES 32 -namespace urde { +namespace metaforce { namespace { struct FogVolumeControl { std::array, 12> xfc_{ @@ -1418,4 +1418,4 @@ void CBooRenderer::DrawOverlappingWorldModelShadows(int alphaVal, const std::vec } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CBooRenderer.hpp b/Runtime/Graphics/CBooRenderer.hpp index 7e8d54cd4..97d2ab1fe 100644 --- a/Runtime/Graphics/CBooRenderer.hpp +++ b/Runtime/Graphics/CBooRenderer.hpp @@ -30,7 +30,7 @@ #include #include -namespace urde { +namespace metaforce { class CBooModel; class CMemorySys; class CParticleGen; @@ -302,4 +302,4 @@ public: bool IsThermalVisorHotPass() const { return m_thermalHotPass; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CDrawable.hpp b/Runtime/Graphics/CDrawable.hpp index 5329fb267..5a84a1dd5 100644 --- a/Runtime/Graphics/CDrawable.hpp +++ b/Runtime/Graphics/CDrawable.hpp @@ -3,7 +3,7 @@ #include "Runtime/GCNTypes.hpp" #include -namespace urde { +namespace metaforce { enum class EDrawableType : u16 { WorldSurface, Particle, Actor, SimpleShadow, Decal }; class CDrawable { @@ -24,4 +24,4 @@ public: const void* GetData() const { return x4_data; } u16 GetExtraSort() const { return x2_extraSort; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CDrawablePlaneObject.hpp b/Runtime/Graphics/CDrawablePlaneObject.hpp index 0ade8d42a..48bab8e6e 100644 --- a/Runtime/Graphics/CDrawablePlaneObject.hpp +++ b/Runtime/Graphics/CDrawablePlaneObject.hpp @@ -3,7 +3,7 @@ #include "Runtime/Graphics/CDrawable.hpp" #include -namespace urde { +namespace metaforce { class CDrawablePlaneObject : public CDrawable { friend class Buckets; u16 x24_targetBucket = 0; @@ -22,4 +22,4 @@ public: , x3c_25_zOnly{zOnly} {} const zeus::CPlane& GetPlane() const { return x2c_plane; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CGraphics.cpp b/Runtime/Graphics/CGraphics.cpp index 18cdec78e..bb9cd69c7 100644 --- a/Runtime/Graphics/CGraphics.cpp +++ b/Runtime/Graphics/CGraphics.cpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { CGraphics::CProjectionState CGraphics::g_Proj; CGraphics::CFogState CGraphics::g_Fog; @@ -510,5 +510,5 @@ const CTevCombiners::CTevPass CGraphics::sTevPass805a6038( const CTevCombiners::CTevPass CGraphics::sTevPass805a6084( {GX::TevColorArg::CC_ZERO, GX::TevColorArg::CC_CPREV, GX::TevColorArg::CC_APREV, GX::TevColorArg::CC_ZERO}, {GX::TevAlphaArg::CA_ZERO, GX::TevAlphaArg::CA_ZERO, GX::TevAlphaArg::CA_ZERO, GX::TevAlphaArg::CA_APREV}); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CGraphics.hpp b/Runtime/Graphics/CGraphics.hpp index b85a51dce..14bf97e41 100644 --- a/Runtime/Graphics/CGraphics.hpp +++ b/Runtime/Graphics/CGraphics.hpp @@ -21,7 +21,7 @@ using frame_clock = std::chrono::high_resolution_clock; -namespace urde { +namespace metaforce { extern hecl::CVar* g_disableLighting; class CLight; class CTimeProvider; @@ -441,4 +441,4 @@ public: #define SCOPED_GRAPHICS_DEBUG_GROUP(...) #endif -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CGraphicsPalette.hpp b/Runtime/Graphics/CGraphicsPalette.hpp index 6c7b7e25b..3c83d78b7 100644 --- a/Runtime/Graphics/CGraphicsPalette.hpp +++ b/Runtime/Graphics/CGraphicsPalette.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { enum class EPaletteFormat { IA8 = 0x0, @@ -32,4 +32,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CLight.cpp b/Runtime/Graphics/CLight.cpp index ff40f8bb8..e56b05498 100644 --- a/Runtime/Graphics/CLight.cpp +++ b/Runtime/Graphics/CLight.cpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { constexpr zeus::CVector3f kDefaultPosition(0.f, 0.f, 0.f); constexpr zeus::CVector3f kDefaultDirection(0.f, -1.f, 0.f); @@ -113,4 +113,4 @@ CLight CLight::BuildLocalAmbient(const zeus::CVector3f& pos, const zeus::CColor& return CLight(ELightType::LocalAmbient, pos, kDefaultDirection, color, 180.f); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CLight.hpp b/Runtime/Graphics/CLight.hpp index b2b699efe..4321de1b4 100644 --- a/Runtime/Graphics/CLight.hpp +++ b/Runtime/Graphics/CLight.hpp @@ -5,7 +5,7 @@ #include #include -namespace urde { +namespace metaforce { enum class ELightType { Spot = 0, @@ -103,4 +103,4 @@ public: static CLight BuildLocalAmbient(const zeus::CVector3f& pos, const zeus::CColor& color); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CLineRenderer.cpp b/Runtime/Graphics/CLineRenderer.cpp index 340377476..ef2dde9a5 100644 --- a/Runtime/Graphics/CLineRenderer.cpp +++ b/Runtime/Graphics/CLineRenderer.cpp @@ -4,8 +4,8 @@ #include -namespace urde { -logvisor::Module LineRendererLog("urde::CLineRenderer"); +namespace metaforce { +logvisor::Module LineRendererLog("metaforce::CLineRenderer"); void CLineRenderer::Initialize() { CLineRendererShaders::Initialize(); } @@ -390,4 +390,4 @@ void CLineRenderer::Render(bool alphaWrite, const zeus::CColor& moduColor) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CLineRenderer.hpp b/Runtime/Graphics/CLineRenderer.hpp index c17ad69bf..924ce30d8 100644 --- a/Runtime/Graphics/CLineRenderer.hpp +++ b/Runtime/Graphics/CLineRenderer.hpp @@ -16,7 +16,7 @@ #include #include -namespace urde { +namespace metaforce { class CLineRenderer { public: @@ -93,4 +93,4 @@ public: static void Shutdown(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CMetroidModelInstance.hpp b/Runtime/Graphics/CMetroidModelInstance.hpp index b3305b176..9bedb439d 100644 --- a/Runtime/Graphics/CMetroidModelInstance.hpp +++ b/Runtime/Graphics/CMetroidModelInstance.hpp @@ -13,7 +13,7 @@ #include #include -namespace urde { +namespace metaforce { class CBooModel; struct CBooSurface; @@ -43,4 +43,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CModel.hpp b/Runtime/Graphics/CModel.hpp index 74cd59816..85042ecd3 100644 --- a/Runtime/Graphics/CModel.hpp +++ b/Runtime/Graphics/CModel.hpp @@ -18,7 +18,7 @@ #include #include -namespace urde { +namespace metaforce { class CLight; class CModel; class CPoseAsTransforms; @@ -62,7 +62,7 @@ struct CModelFlags { bool operator!=(const CModelFlags& other) const { return !operator==(other); } }; -/* urde addition: doesn't require hacky stashing of +/* metaforce addition: doesn't require hacky stashing of * pointers within loaded CMDL buffer */ struct CBooSurface { DataSpec::DNACMDL::SurfaceHeader_2 m_data; @@ -157,7 +157,7 @@ private: CModelShaders::LightingUniform m_lightingData; - /* urde addition: boo! */ + /* metaforce addition: boo! */ size_t m_uniformDataSize = 0; struct ModelInstance { boo::ObjToken m_geomUniformBuffer; @@ -275,7 +275,7 @@ class CModel { // CModel* x34_prev = nullptr; int x38_lastFrame; - /* urde addition: boo! */ + /* metaforce addition: boo! */ boo::ObjToken m_staticVbo; hecl::HMDLMeta m_hmdlMeta; std::unique_ptr m_dynamicVertexData; @@ -310,7 +310,7 @@ public: static void WarmupShaders(const SObjectTag& cmdlTag); }; -CFactoryFnReturn FModelFactory(const urde::SObjectTag& tag, std::unique_ptr&& in, u32 len, - const urde::CVParamTransfer& vparms, CObjectReference* selfRef); +CFactoryFnReturn FModelFactory(const metaforce::SObjectTag& tag, std::unique_ptr&& in, u32 len, + const metaforce::CVParamTransfer& vparms, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CModelBoo.cpp b/Runtime/Graphics/CModelBoo.cpp index 7fbd27142..e7c7fd5c0 100644 --- a/Runtime/Graphics/CModelBoo.cpp +++ b/Runtime/Graphics/CModelBoo.cpp @@ -17,9 +17,9 @@ #include #include -namespace urde { +namespace metaforce { namespace { -logvisor::Module Log("urde::CBooModel"); +logvisor::Module Log("metaforce::CBooModel"); CBooModel* g_FirstModel = nullptr; constexpr zeus::CMatrix4f ReflectBaseMtx{ @@ -1346,11 +1346,11 @@ void CModel::WarmupShaders(const SObjectTag& cmdlTag) { modelObj->_WarmupShaders(); } -CFactoryFnReturn FModelFactory(const urde::SObjectTag& tag, std::unique_ptr&& in, u32 len, - const urde::CVParamTransfer& vparms, CObjectReference* selfRef) { +CFactoryFnReturn FModelFactory(const metaforce::SObjectTag& tag, std::unique_ptr&& in, u32 len, + const metaforce::CVParamTransfer& vparms, CObjectReference* selfRef) { CSimplePool* sp = vparms.GetOwnedObj(); CFactoryFnReturn ret = TToken::GetIObjObjectFor(std::make_unique(std::move(in), len, sp, selfRef)); return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CMoviePlayer.cpp b/Runtime/Graphics/CMoviePlayer.cpp index 75960d5ee..d779c590d 100644 --- a/Runtime/Graphics/CMoviePlayer.cpp +++ b/Runtime/Graphics/CMoviePlayer.cpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { /* used in the original to look up fixed-point dividends on a * MIDI-style volume scale (0-127) -> (n/0x8000) */ @@ -207,7 +207,7 @@ CMoviePlayer::CMoviePlayer(const char* path, float preLoadSeconds, bool loop, bo for (int i = 0; i < 3; ++i) { CTHPTextureSet& set = x80_textures.emplace_back(); if (deinterlace) { - /* urde addition: this way interlaced THPs don't look horrible */ + /* metaforce addition: this way interlaced THPs don't look horrible */ set.Y[0] = ctx.newDynamicTexture(x6c_videoInfo.width, x6c_videoInfo.height / 2, boo::TextureFormat::I8, boo::TextureClampMode::Repeat); set.Y[1] = ctx.newDynamicTexture(x6c_videoInfo.width, x6c_videoInfo.height / 2, boo::TextureFormat::I8, @@ -315,7 +315,7 @@ void CMoviePlayer::MixAudio(s16* out, const s16* in, u32 samples) { tex->playedSamples += thisSamples; samples -= thisSamples; } else { - /* urde addition: failsafe for buffer overrun */ + /* metaforce addition: failsafe for buffer overrun */ if (in) memmove(out, in, samples * 4); else @@ -334,7 +334,7 @@ void CMoviePlayer::MixStaticAudio(s16* out, const s16* in, u32 samples) { const u8* thisOffsetLeft = &StaticAudio[StaticAudioOffset / 2]; const u8* thisOffsetRight = &StaticAudio[StaticAudioSize / 2 + StaticAudioOffset / 2]; - /* urde addition: mix samples with `in` or no mix */ + /* metaforce addition: mix samples with `in` or no mix */ if (in) { for (u32 i = 0; i < thisSamples; i += 2) { out[0] = DSPSampClamp( @@ -415,7 +415,7 @@ void CMoviePlayer::DrawFrame() { CGraphics::DrawArray(0, 4); /* ensure second field is being displayed by VI to signal advance - * (faked in urde with continuous xor) */ + * (faked in metaforce with continuous xor) */ if (!xfc_fieldIndex && CGraphics::g_LastFrameUsedAbove) xf4_26_fieldFlip = true; @@ -609,4 +609,4 @@ void CMoviePlayer::PostDVDReadRequestIfNeeded() { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CMoviePlayer.hpp b/Runtime/Graphics/CMoviePlayer.hpp index f2645432c..bcc02a991 100644 --- a/Runtime/Graphics/CMoviePlayer.hpp +++ b/Runtime/Graphics/CMoviePlayer.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { class CMoviePlayer : public CDvdFile { public: @@ -149,4 +149,4 @@ public: static void Shutdown(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CPVSAreaSet.cpp b/Runtime/Graphics/CPVSAreaSet.cpp index 1caa15add..450b661d9 100644 --- a/Runtime/Graphics/CPVSAreaSet.cpp +++ b/Runtime/Graphics/CPVSAreaSet.cpp @@ -1,6 +1,6 @@ #include "Runtime/Graphics/CPVSAreaSet.hpp" -namespace urde { +namespace metaforce { CPVSAreaSet::CPVSAreaSet(const u8* data, u32 len) { CMemoryInStream r(data, len); @@ -18,4 +18,4 @@ CPVSAreaSet::CPVSAreaSet(const u8* data, u32 len) { x20_octree = CPVSVisOctree::MakePVSVisOctree(octreeData); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CPVSAreaSet.hpp b/Runtime/Graphics/CPVSAreaSet.hpp index dfee06e3b..9778b9ea9 100644 --- a/Runtime/Graphics/CPVSAreaSet.hpp +++ b/Runtime/Graphics/CPVSAreaSet.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Graphics/CPVSVisOctree.hpp" -namespace urde { +namespace metaforce { class CPVSAreaSet { u32 x0_numFeatures; @@ -37,4 +37,4 @@ public: CPVSVisSet Get2ndLightSet(size_t lightIdx) const { return _GetLightSet(lightIdx); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CPVSVisOctree.cpp b/Runtime/Graphics/CPVSVisOctree.cpp index ed278b2d4..37391418d 100644 --- a/Runtime/Graphics/CPVSVisOctree.cpp +++ b/Runtime/Graphics/CPVSVisOctree.cpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { CPVSVisOctree CPVSVisOctree::MakePVSVisOctree(const u8* data) { CMemoryInStream r(data, 68); @@ -90,4 +90,4 @@ s32 CPVSVisOctree::IterateSearch(u8 nodeData, const zeus::CVector3f& tp) const { highFlags[2] * axisCounts[0] * axisCounts[1] * bool(nodeData & 0x4); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CPVSVisOctree.hpp b/Runtime/Graphics/CPVSVisOctree.hpp index 9116546ac..ad49ff0e2 100644 --- a/Runtime/Graphics/CPVSVisOctree.hpp +++ b/Runtime/Graphics/CPVSVisOctree.hpp @@ -6,7 +6,7 @@ #include #include -namespace urde { +namespace metaforce { class CPVSVisOctree { zeus::CAABox x0_aabb; @@ -31,4 +31,4 @@ public: s32 IterateSearch(u8 nodeData, const zeus::CVector3f& tp) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CPVSVisSet.cpp b/Runtime/Graphics/CPVSVisSet.cpp index 7ed070c17..f8180a56d 100644 --- a/Runtime/Graphics/CPVSVisSet.cpp +++ b/Runtime/Graphics/CPVSVisSet.cpp @@ -2,7 +2,7 @@ #include "Runtime/Graphics/CPVSVisOctree.hpp" -namespace urde { +namespace metaforce { void CPVSVisSet::Reset(EPVSVisSetState state) { x0_state = state; @@ -88,4 +88,4 @@ void CPVSVisSet::SetTestPoint(const CPVSVisOctree& octree, const zeus::CVector3f } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CPVSVisSet.hpp b/Runtime/Graphics/CPVSVisSet.hpp index 51967d7b9..ab5fbf19b 100644 --- a/Runtime/Graphics/CPVSVisSet.hpp +++ b/Runtime/Graphics/CPVSVisSet.hpp @@ -3,7 +3,7 @@ #include "Runtime/RetroTypes.hpp" #include -namespace urde { +namespace metaforce { class CPVSVisOctree; enum class EPVSVisSetState { EndOfTree, NodeFound, OutOfBounds }; @@ -23,4 +23,4 @@ public: void SetTestPoint(const CPVSVisOctree& octree, const zeus::CVector3f&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CRainSplashGenerator.cpp b/Runtime/Graphics/CRainSplashGenerator.cpp index 22340971e..18abf0707 100644 --- a/Runtime/Graphics/CRainSplashGenerator.cpp +++ b/Runtime/Graphics/CRainSplashGenerator.cpp @@ -5,7 +5,7 @@ #include "Runtime/Graphics/CBooRenderer.hpp" #include "Runtime/World/CWorld.hpp" -namespace urde { +namespace metaforce { CRainSplashGenerator::CRainSplashGenerator(const zeus::CVector3f& scale, u32 maxSplashes, u32 genRate, float minZ, float alpha) @@ -196,4 +196,4 @@ void CRainSplashGenerator::GeneratePoints(const std::vector -namespace urde { +namespace metaforce { class CStateManager; class CRainSplashGenerator { @@ -73,4 +73,4 @@ public: bool IsRaining() const { return x48_25_raining; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CSimpleShadow.cpp b/Runtime/Graphics/CSimpleShadow.cpp index 91cc6cbc7..ee5c22e41 100644 --- a/Runtime/Graphics/CSimpleShadow.cpp +++ b/Runtime/Graphics/CSimpleShadow.cpp @@ -3,7 +3,7 @@ #include "Runtime/CStateManager.hpp" #include "Runtime/Collision/CGameCollision.hpp" -namespace urde { +namespace metaforce { CSimpleShadow::CSimpleShadow(float scale, float userAlpha, float maxObjHeight, float displacement) : x30_scale(scale), x38_userAlpha(userAlpha), x40_maxObjHeight(maxObjHeight), x44_displacement(displacement) {} @@ -81,4 +81,4 @@ void CSimpleShadow::Calculate(const zeus::CAABox& aabb, const zeus::CTransform& } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CSimpleShadow.hpp b/Runtime/Graphics/CSimpleShadow.hpp index ec36cae07..acf8827e5 100644 --- a/Runtime/Graphics/CSimpleShadow.hpp +++ b/Runtime/Graphics/CSimpleShadow.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CTexture; class CStateManager; @@ -36,4 +36,4 @@ public: void Render(const TLockedToken& tex); void Calculate(const zeus::CAABox& aabb, const zeus::CTransform& xf, const CStateManager& mgr); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CSkinnedModel.cpp b/Runtime/Graphics/CSkinnedModel.cpp index 757859689..6d42878bc 100644 --- a/Runtime/Graphics/CSkinnedModel.cpp +++ b/Runtime/Graphics/CSkinnedModel.cpp @@ -5,8 +5,8 @@ #include -namespace urde { -static logvisor::Module Log("urde::CSkinnedModel"); +namespace metaforce { +static logvisor::Module Log("metaforce::CSkinnedModel"); CSkinnedModel::CSkinnedModel(TLockedToken model, TLockedToken skinRules, TLockedToken layoutInfo, int shaderIdx, int drawInsts) @@ -64,4 +64,4 @@ CMorphableSkinnedModel::CMorphableSkinnedModel(IObjectStore& store, CAssetId mod CSkinnedModel::FPointGenerator CSkinnedModel::g_PointGenFunc = nullptr; void* CSkinnedModel::g_PointGenCtx = nullptr; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CSkinnedModel.hpp b/Runtime/Graphics/CSkinnedModel.hpp index 82dbdf89b..e977c1078 100644 --- a/Runtime/Graphics/CSkinnedModel.hpp +++ b/Runtime/Graphics/CSkinnedModel.hpp @@ -11,7 +11,7 @@ #include -namespace urde { +namespace metaforce { class CCharLayoutInfo; class CModel; class CPoseAsTransforms; @@ -66,4 +66,4 @@ public: const float* GetMorphMagnitudes() const { return x40_morphMagnitudes.get(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CTexture.hpp b/Runtime/Graphics/CTexture.hpp index ded69b7a1..272dac108 100644 --- a/Runtime/Graphics/CTexture.hpp +++ b/Runtime/Graphics/CTexture.hpp @@ -11,7 +11,7 @@ #include -namespace urde { +namespace metaforce { class CVParamTransfer; class CTextureInfo; @@ -77,7 +77,7 @@ public: const CTextureInfo* GetTextureInfo() const { return m_textureInfo; } }; -CFactoryFnReturn FTextureFactory(const urde::SObjectTag& tag, std::unique_ptr&& in, u32 len, - const urde::CVParamTransfer& vparms, CObjectReference* selfRef); +CFactoryFnReturn FTextureFactory(const metaforce::SObjectTag& tag, std::unique_ptr&& in, u32 len, + const metaforce::CVParamTransfer& vparms, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CTextureBoo.cpp b/Runtime/Graphics/CTextureBoo.cpp index 5c298eb4c..23c79912a 100644 --- a/Runtime/Graphics/CTextureBoo.cpp +++ b/Runtime/Graphics/CTextureBoo.cpp @@ -8,9 +8,9 @@ #include "Runtime/CTextureCache.hpp" #include "Runtime/GameGlobalObjects.hpp" -namespace urde { +namespace metaforce { namespace { -logvisor::Module Log("urde::CTextureBoo"); +logvisor::Module Log("metaforce::CTextureBoo"); struct RGBA8 { u8 r; @@ -889,8 +889,8 @@ const boo::ObjToken& CTexture::GetFontTexture(EFontType tp) { return m_booTex; } -CFactoryFnReturn FTextureFactory(const urde::SObjectTag& tag, std::unique_ptr&& in, u32 len, - const urde::CVParamTransfer& vparms, CObjectReference* selfRef) { +CFactoryFnReturn FTextureFactory(const metaforce::SObjectTag& tag, std::unique_ptr&& in, u32 len, + const metaforce::CVParamTransfer& vparms, CObjectReference* selfRef) { u32 u32Owned = vparms.GetOwnedObj(); const CTextureInfo* inf = nullptr; if (g_TextureCache) @@ -899,4 +899,4 @@ CFactoryFnReturn FTextureFactory(const urde::SObjectTag& tag, std::unique_ptr(std::move(in), len, u32Owned == SBIG('OTEX'), inf)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/CVertexMorphEffect.cpp b/Runtime/Graphics/CVertexMorphEffect.cpp index 3a3d0ed81..eb4678d3b 100644 --- a/Runtime/Graphics/CVertexMorphEffect.cpp +++ b/Runtime/Graphics/CVertexMorphEffect.cpp @@ -2,7 +2,7 @@ #include "Runtime/Character/CSkinRules.hpp" -namespace urde { +namespace metaforce { CVertexMorphEffect::CVertexMorphEffect(const zeus::CUnitVector3f& v1, const zeus::CVector3f& v2, float diagExtent, float f2, CRandom16& random) @@ -12,4 +12,4 @@ void CVertexMorphEffect::MorphVertices(std::vector& skinRules, const CPoseAsTransforms& pose) const {} -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/Graphics/CVertexMorphEffect.hpp b/Runtime/Graphics/CVertexMorphEffect.hpp index 7984a376d..49a7c294f 100644 --- a/Runtime/Graphics/CVertexMorphEffect.hpp +++ b/Runtime/Graphics/CVertexMorphEffect.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CRandom16; class CSkinRules; @@ -34,4 +34,4 @@ public: void Update(float) {} }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/IRenderer.hpp b/Runtime/Graphics/IRenderer.hpp index 4817183ca..eb5364a92 100644 --- a/Runtime/Graphics/IRenderer.hpp +++ b/Runtime/Graphics/IRenderer.hpp @@ -13,7 +13,7 @@ #include #include -namespace urde { +namespace metaforce { class CAreaOctTree; class CLight; class CMetroidModelInstance; @@ -104,4 +104,4 @@ public: virtual void PrepareDynamicLights(const std::vector& lights) = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/IWeaponRenderer.cpp b/Runtime/Graphics/IWeaponRenderer.cpp index e90f25928..4f48c1312 100644 --- a/Runtime/Graphics/IWeaponRenderer.cpp +++ b/Runtime/Graphics/IWeaponRenderer.cpp @@ -2,8 +2,8 @@ #include "Runtime/Particle/CParticleGen.hpp" -namespace urde { +namespace metaforce { void CDefaultWeaponRenderer::AddParticleGen(CParticleGen& gen) { gen.Render(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/IWeaponRenderer.hpp b/Runtime/Graphics/IWeaponRenderer.hpp index 42e706dbd..63033a118 100644 --- a/Runtime/Graphics/IWeaponRenderer.hpp +++ b/Runtime/Graphics/IWeaponRenderer.hpp @@ -1,6 +1,6 @@ #pragma once -namespace urde { +namespace metaforce { class CParticleGen; class IWeaponRenderer { @@ -14,4 +14,4 @@ public: void AddParticleGen(CParticleGen&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CAABoxShader.cpp b/Runtime/Graphics/Shaders/CAABoxShader.cpp index a697cece9..6303478bc 100644 --- a/Runtime/Graphics/Shaders/CAABoxShader.cpp +++ b/Runtime/Graphics/Shaders/CAABoxShader.cpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { static boo::ObjToken s_Pipeline; static boo::ObjToken s_zOnlyPipeline; @@ -76,4 +76,4 @@ void CAABoxShader::draw(const zeus::CColor& color) { CGraphics::DrawArray(0, 34); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CAABoxShader.hpp b/Runtime/Graphics/Shaders/CAABoxShader.hpp index ff3785fd0..831a58234 100644 --- a/Runtime/Graphics/Shaders/CAABoxShader.hpp +++ b/Runtime/Graphics/Shaders/CAABoxShader.hpp @@ -9,7 +9,7 @@ namespace zeus { class CAABox; } -namespace urde { +namespace metaforce { class CAABoxShader { struct Uniform { @@ -29,4 +29,4 @@ public: void draw(const zeus::CColor& color); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp b/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp index 84cdecc8e..341ac9afe 100644 --- a/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp +++ b/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { namespace { struct Vert { zeus::CVector2f m_pos; @@ -81,4 +81,4 @@ void CCameraBlurFilter::draw(float amount, bool clearDepth) { CGraphics::DrawArray(0, 4); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp b/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp index 0855611a8..0c1235b43 100644 --- a/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp +++ b/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp @@ -4,7 +4,7 @@ #include #include -namespace urde { +namespace metaforce { class CCameraBlurFilter { struct Uniform { @@ -24,4 +24,4 @@ public: void draw(float amount, bool clearDepth = false); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CColoredQuadFilter.cpp b/Runtime/Graphics/Shaders/CColoredQuadFilter.cpp index d44caf6f5..da9b3c921 100644 --- a/Runtime/Graphics/Shaders/CColoredQuadFilter.cpp +++ b/Runtime/Graphics/Shaders/CColoredQuadFilter.cpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { static boo::ObjToken s_AlphaPipeline; static boo::ObjToken s_AddPipeline; @@ -113,4 +113,4 @@ void CWideScreenFilter::SetViewportToFull() { CGraphics::g_BooMainCommandQueue->setViewport(rect); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp b/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp index 817e798e3..388be7ce6 100644 --- a/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp +++ b/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class CTexture; enum class EFilterShape; @@ -49,4 +49,4 @@ public: static void SetViewportToFull(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CColoredStripShader.cpp b/Runtime/Graphics/Shaders/CColoredStripShader.cpp index 653c3bda3..7bbae149d 100644 --- a/Runtime/Graphics/Shaders/CColoredStripShader.cpp +++ b/Runtime/Graphics/Shaders/CColoredStripShader.cpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { static boo::ObjToken s_Pipeline; static boo::ObjToken s_AdditivePipeline; diff --git a/Runtime/Graphics/Shaders/CColoredStripShader.hpp b/Runtime/Graphics/Shaders/CColoredStripShader.hpp index bd6373a33..06d57344a 100644 --- a/Runtime/Graphics/Shaders/CColoredStripShader.hpp +++ b/Runtime/Graphics/Shaders/CColoredStripShader.hpp @@ -5,8 +5,7 @@ #include #include -namespace urde -{ +namespace metaforce { class CColoredStripShader { public: diff --git a/Runtime/Graphics/Shaders/CDecalShaders.cpp b/Runtime/Graphics/Shaders/CDecalShaders.cpp index ab2dc6045..28c0d45db 100644 --- a/Runtime/Graphics/Shaders/CDecalShaders.cpp +++ b/Runtime/Graphics/Shaders/CDecalShaders.cpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { void CDecalShaders::Initialize() { m_texZTestNoZWrite = hecl::conv->convert(Shader_CDecalShaderTexZTest{}); @@ -69,4 +69,4 @@ void CDecalShaders::BuildShaderDataBinding(boo::IGraphicsDataFactory::Context& c } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CDecalShaders.hpp b/Runtime/Graphics/Shaders/CDecalShaders.hpp index a25386c0d..32a402961 100644 --- a/Runtime/Graphics/Shaders/CDecalShaders.hpp +++ b/Runtime/Graphics/Shaders/CDecalShaders.hpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { struct CQuadDecal; class CDecalShaders { @@ -20,4 +20,4 @@ public: static void BuildShaderDataBinding(boo::IGraphicsDataFactory::Context& ctx, CQuadDecal& decal); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CElementGenShaders.cpp b/Runtime/Graphics/Shaders/CElementGenShaders.cpp index 56b86e3a1..b0fc9bc61 100644 --- a/Runtime/Graphics/Shaders/CElementGenShaders.cpp +++ b/Runtime/Graphics/Shaders/CElementGenShaders.cpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { void CElementGenShaders::Initialize() { m_texZTestZWrite = {hecl::conv->convert(Shader_CElementGenShaderTexZTestZWrite{}), @@ -271,4 +271,4 @@ void CElementGenShaders::BuildShaderDataBinding(boo::IGraphicsDataFactory::Conte } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CElementGenShaders.hpp b/Runtime/Graphics/Shaders/CElementGenShaders.hpp index de08120b0..386e943d9 100644 --- a/Runtime/Graphics/Shaders/CElementGenShaders.hpp +++ b/Runtime/Graphics/Shaders/CElementGenShaders.hpp @@ -4,7 +4,7 @@ #include -namespace urde { +namespace metaforce { class CElementGen; class CElementGenShaders { @@ -47,4 +47,4 @@ public: static void BuildShaderDataBinding(boo::IGraphicsDataFactory::Context& ctx, CElementGen& gen); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CEnergyBarShader.cpp b/Runtime/Graphics/Shaders/CEnergyBarShader.cpp index 75688ec42..82810bdb4 100644 --- a/Runtime/Graphics/Shaders/CEnergyBarShader.cpp +++ b/Runtime/Graphics/Shaders/CEnergyBarShader.cpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { static boo::ObjToken s_Pipeline; @@ -88,4 +88,4 @@ void CEnergyBarShader::draw(const zeus::CColor& color0, const std::vector #include -namespace urde { +namespace metaforce { class CTexture; class CEnergyBarShader { @@ -41,4 +41,4 @@ public: const CTexture* tex); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CEnvFxShaders.cpp b/Runtime/Graphics/Shaders/CEnvFxShaders.cpp index ee3497cce..0a1d48fc5 100644 --- a/Runtime/Graphics/Shaders/CEnvFxShaders.cpp +++ b/Runtime/Graphics/Shaders/CEnvFxShaders.cpp @@ -4,7 +4,7 @@ #include -namespace urde { +namespace metaforce { boo::ObjToken CEnvFxShaders::m_snowPipeline; boo::ObjToken CEnvFxShaders::m_underwaterPipeline; @@ -54,4 +54,4 @@ void CEnvFxShaders::BuildShaderDataBinding(boo::IGraphicsDataFactory::Context& c textures.size(), textures.data(), nullptr, nullptr, 0, iBufInfo.second); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CEnvFxShaders.hpp b/Runtime/Graphics/Shaders/CEnvFxShaders.hpp index 37947fa55..2425264b6 100644 --- a/Runtime/Graphics/Shaders/CEnvFxShaders.hpp +++ b/Runtime/Graphics/Shaders/CEnvFxShaders.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CEnvFxManager; class CEnvFxManagerGrid; @@ -38,4 +38,4 @@ public: CEnvFxManagerGrid& grid); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CFluidPlaneShader.cpp b/Runtime/Graphics/Shaders/CFluidPlaneShader.cpp index f845e2f8e..2c2f2bc88 100644 --- a/Runtime/Graphics/Shaders/CFluidPlaneShader.cpp +++ b/Runtime/Graphics/Shaders/CFluidPlaneShader.cpp @@ -5,7 +5,7 @@ #include -namespace urde { +namespace metaforce { CFluidPlaneShader::Cache CFluidPlaneShader::_cache = {}; @@ -284,4 +284,4 @@ void CFluidPlaneShader::loadVerts(const std::vector& verts, const std::v m_pvbo->load(pVerts.data(), pVerts.size() * sizeof(PatchVertex)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp b/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp index 6109af8cd..258b86e7a 100644 --- a/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp +++ b/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp @@ -17,7 +17,7 @@ #include #include -namespace urde { +namespace metaforce { class CFluidPlaneShader { public: @@ -175,4 +175,4 @@ public: static void Shutdown(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CFogVolumeFilter.cpp b/Runtime/Graphics/Shaders/CFogVolumeFilter.cpp index 7c0c9f344..80e3033fe 100644 --- a/Runtime/Graphics/Shaders/CFogVolumeFilter.cpp +++ b/Runtime/Graphics/Shaders/CFogVolumeFilter.cpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { static boo::ObjToken s_1WayPipeline; static boo::ObjToken s_2WayPipeline; @@ -74,4 +74,4 @@ void CFogVolumeFilter::draw1WayPass(const zeus::CColor& color) { CGraphics::DrawArray(0, 4); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp b/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp index 49f55cf21..bff2340db 100644 --- a/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp +++ b/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp @@ -12,7 +12,7 @@ namespace zeus { class CColor; } -namespace urde { +namespace metaforce { class CFogVolumeFilter { boo::ObjToken m_vbo; @@ -28,4 +28,4 @@ public: void draw1WayPass(const zeus::CColor& color); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CFogVolumePlaneShader.cpp b/Runtime/Graphics/Shaders/CFogVolumePlaneShader.cpp index d9073bc5a..29f44ff7e 100644 --- a/Runtime/Graphics/Shaders/CFogVolumePlaneShader.cpp +++ b/Runtime/Graphics/Shaders/CFogVolumePlaneShader.cpp @@ -4,7 +4,7 @@ #include -namespace urde { +namespace metaforce { static std::array, 4> s_Pipelines; @@ -62,4 +62,4 @@ void CFogVolumePlaneShader::draw(int pass) { CGraphics::DrawArray(0, m_verts.size()); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp b/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp index b015390ce..10f7473b4 100644 --- a/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp +++ b/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp @@ -13,7 +13,7 @@ namespace zeus { class CVector3f; } -namespace urde { +namespace metaforce { class CFogVolumePlaneShader { boo::ObjToken m_vbo; @@ -35,4 +35,4 @@ public: void draw(int pass); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CLineRendererShaders.cpp b/Runtime/Graphics/Shaders/CLineRendererShaders.cpp index e81357363..d3145b43d 100644 --- a/Runtime/Graphics/Shaders/CLineRendererShaders.cpp +++ b/Runtime/Graphics/Shaders/CLineRendererShaders.cpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { void CLineRendererShaders::Initialize() { CGraphics::CommitResources([](boo::IGraphicsDataFactory::Context& ctx) { @@ -104,4 +104,4 @@ void CLineRendererShaders::BuildShaderDataBinding(boo::IGraphicsDataFactory::Con } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CLineRendererShaders.hpp b/Runtime/Graphics/Shaders/CLineRendererShaders.hpp index eb64f4512..e0d44169d 100644 --- a/Runtime/Graphics/Shaders/CLineRendererShaders.hpp +++ b/Runtime/Graphics/Shaders/CLineRendererShaders.hpp @@ -4,7 +4,7 @@ #include -namespace urde { +namespace metaforce { class CLineRenderer; class CLineRendererShaders { @@ -30,4 +30,4 @@ public: bool zGEqual); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp b/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp index e35fdd4cb..5ad827ba4 100644 --- a/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp +++ b/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { static boo::ObjToken s_Pipeline; @@ -33,4 +33,4 @@ void CMapSurfaceShader::draw(const zeus::CColor& color, u32 start, u32 count) { CGraphics::DrawArrayIndexed(start, count); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp b/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp index f9825fd60..b3504c15d 100644 --- a/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp +++ b/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CMapSurfaceShader { struct Uniform { @@ -28,4 +28,4 @@ public: void draw(const zeus::CColor& color, u32 start, u32 count); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CModelShaders.cpp b/Runtime/Graphics/Shaders/CModelShaders.cpp index e22628fd9..ba66992c8 100644 --- a/Runtime/Graphics/Shaders/CModelShaders.cpp +++ b/Runtime/Graphics/Shaders/CModelShaders.cpp @@ -6,7 +6,7 @@ #include #include -namespace urde { +namespace metaforce { std::unordered_map CModelShaders::g_ShaderPipelines; @@ -230,4 +230,4 @@ CModelShaders::ShaderPipelines CModelShaders::BuildExtendedShader(const hecl::Ba return newPipelines; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CModelShaders.hpp b/Runtime/Graphics/Shaders/CModelShaders.hpp index d279532da..34f447b5f 100644 --- a/Runtime/Graphics/Shaders/CModelShaders.hpp +++ b/Runtime/Graphics/Shaders/CModelShaders.hpp @@ -18,7 +18,7 @@ namespace hecl::Backend { class ShaderTag; } -namespace urde { +namespace metaforce { class CLight; enum class EExtendedShader : uint8_t { @@ -110,4 +110,4 @@ private: static std::unordered_map g_ShaderPipelines; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CParticleSwooshShaders.cpp b/Runtime/Graphics/Shaders/CParticleSwooshShaders.cpp index 2deef8f1b..4003673ae 100644 --- a/Runtime/Graphics/Shaders/CParticleSwooshShaders.cpp +++ b/Runtime/Graphics/Shaders/CParticleSwooshShaders.cpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { std::array, 2> CParticleSwooshShaders::m_texZWrite; std::array, 2> CParticleSwooshShaders::m_texNoZWrite; @@ -101,4 +101,4 @@ void CParticleSwooshShaders::BuildShaderDataBinding(boo::IGraphicsDataFactory::C } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp b/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp index 78b0c357e..bcdd8aae4 100644 --- a/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp +++ b/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class CParticleSwoosh; class CParticleSwooshShaders { @@ -39,4 +39,4 @@ public: static void BuildShaderDataBinding(boo::IGraphicsDataFactory::Context& ctx, CParticleSwoosh& gen); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CPhazonSuitFilter.cpp b/Runtime/Graphics/Shaders/CPhazonSuitFilter.cpp index 4412897fa..7316e32e3 100644 --- a/Runtime/Graphics/Shaders/CPhazonSuitFilter.cpp +++ b/Runtime/Graphics/Shaders/CPhazonSuitFilter.cpp @@ -13,7 +13,7 @@ #include #include -namespace urde { +namespace metaforce { static boo::ObjToken s_IndPipeline; static boo::ObjToken s_Pipeline; @@ -150,4 +150,4 @@ void CPhazonSuitFilter::draw(const zeus::CColor& color, float indScale, float in CGraphics::DrawArray(0, 4); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp b/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp index afe8c7eed..d966356c4 100644 --- a/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp +++ b/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp @@ -6,7 +6,7 @@ namespace zeus { class CColor; } -namespace urde { +namespace metaforce { class CTexture; class CPhazonSuitFilter { @@ -27,4 +27,4 @@ public: void draw(const zeus::CColor& color, float indScale, float indOffX, float indOffY); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CRadarPaintShader.cpp b/Runtime/Graphics/Shaders/CRadarPaintShader.cpp index c891d30cd..2b153f55d 100644 --- a/Runtime/Graphics/Shaders/CRadarPaintShader.cpp +++ b/Runtime/Graphics/Shaders/CRadarPaintShader.cpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { static boo::ObjToken s_Pipeline; @@ -50,4 +50,4 @@ void CRadarPaintShader::draw(const std::vector& instances, const CText CGraphics::DrawInstances(0, 4, instances.size()); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CRadarPaintShader.hpp b/Runtime/Graphics/Shaders/CRadarPaintShader.hpp index 4965ae15a..fbf4e2335 100644 --- a/Runtime/Graphics/Shaders/CRadarPaintShader.hpp +++ b/Runtime/Graphics/Shaders/CRadarPaintShader.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CTexture; class CRadarPaintShader { @@ -33,4 +33,4 @@ public: void draw(const std::vector& instances, const CTexture* tex); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CRandomStaticFilter.cpp b/Runtime/Graphics/Shaders/CRandomStaticFilter.cpp index c1b44e3b4..cc1e857ee 100644 --- a/Runtime/Graphics/Shaders/CRandomStaticFilter.cpp +++ b/Runtime/Graphics/Shaders/CRandomStaticFilter.cpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { static boo::ObjToken s_AlphaPipeline; static boo::ObjToken s_AddPipeline; @@ -80,4 +80,4 @@ void CRandomStaticFilter::draw(const zeus::CColor& color, float t) { CGraphics::DrawArray(0, 4); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp b/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp index 858afe2b9..8cf10f9a6 100644 --- a/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp +++ b/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp @@ -5,7 +5,7 @@ #include #include -namespace urde { +namespace metaforce { class CTexture; enum class EFilterShape; @@ -39,4 +39,4 @@ public: : CCookieCutterDepthRandomStaticFilter(type) {} }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CScanLinesFilter.cpp b/Runtime/Graphics/Shaders/CScanLinesFilter.cpp index f83590224..6dc980e44 100644 --- a/Runtime/Graphics/Shaders/CScanLinesFilter.cpp +++ b/Runtime/Graphics/Shaders/CScanLinesFilter.cpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { static boo::ObjToken s_AlphaPipeline; static boo::ObjToken s_AddPipeline; @@ -64,4 +64,4 @@ void CScanLinesFilter::draw(const zeus::CColor& color) { CGraphics::DrawArray(0, 670); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CScanLinesFilter.hpp b/Runtime/Graphics/Shaders/CScanLinesFilter.hpp index fd20fc785..cdd048fd3 100644 --- a/Runtime/Graphics/Shaders/CScanLinesFilter.hpp +++ b/Runtime/Graphics/Shaders/CScanLinesFilter.hpp @@ -5,7 +5,7 @@ #include #include -namespace urde { +namespace metaforce { class CTexture; enum class EFilterShape; @@ -40,4 +40,4 @@ public: explicit CScanLinesFilterOdd(EFilterType type, const TLockedToken&) : CScanLinesFilterOdd(type) {} }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp b/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp index f0fb34463..ec9478e41 100644 --- a/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp +++ b/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp @@ -7,7 +7,7 @@ #define WARP_RAMP_RES 32 -namespace urde { +namespace metaforce { static boo::ObjToken s_Pipeline; @@ -166,4 +166,4 @@ void CSpaceWarpFilter::draw(const zeus::CVector3f& pt) { CGraphics::DrawArray(0, 4); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp b/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp index 3ad35830d..ac5963b7c 100644 --- a/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp +++ b/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CSpaceWarpFilter { struct Uniform { @@ -35,4 +35,4 @@ public: void draw(const zeus::CVector3f& pt); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CTextSupportShader.cpp b/Runtime/Graphics/Shaders/CTextSupportShader.cpp index de61952ce..9a0525c14 100644 --- a/Runtime/Graphics/Shaders/CTextSupportShader.cpp +++ b/Runtime/Graphics/Shaders/CTextSupportShader.cpp @@ -5,7 +5,7 @@ #include -namespace urde { +namespace metaforce { boo::ObjToken CTextSupportShader::s_TextAlphaPipeline; boo::ObjToken CTextSupportShader::s_TextAddPipeline; @@ -78,4 +78,4 @@ void CTextSupportShader::ImageInstance::SetMetrics(const CFontImageDef& imgDef, m_uv[3].assign(0.5f + cropPad.x(), 0.5f - cropPad.y()); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CTextSupportShader.hpp b/Runtime/Graphics/Shaders/CTextSupportShader.hpp index 83e7eaf1e..37ab564b1 100644 --- a/Runtime/Graphics/Shaders/CTextSupportShader.hpp +++ b/Runtime/Graphics/Shaders/CTextSupportShader.hpp @@ -13,7 +13,7 @@ #include #include -namespace urde { +namespace metaforce { class CGlyph; class CFontImageDef; class CTextRenderBuffer; @@ -97,4 +97,4 @@ public: static void Shutdown(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CTexturedQuadFilter.cpp b/Runtime/Graphics/Shaders/CTexturedQuadFilter.cpp index 672893edf..7bbc857d1 100644 --- a/Runtime/Graphics/Shaders/CTexturedQuadFilter.cpp +++ b/Runtime/Graphics/Shaders/CTexturedQuadFilter.cpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { static boo::ObjToken s_AlphaPipeline; static boo::ObjToken s_AlphaGEqualPipeline; @@ -343,4 +343,4 @@ CTexturedQuadFilterAlpha::CTexturedQuadFilterAlpha(EFilterType type, TLockedToke m_tex = tex; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp b/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp index 27c1205f8..7bae3c3ce 100644 --- a/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp +++ b/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { class CTexture; enum class EFilterShape; @@ -67,4 +67,4 @@ public: explicit CTexturedQuadFilterAlpha(EFilterType type, const boo::ObjToken& tex); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CThermalColdFilter.cpp b/Runtime/Graphics/Shaders/CThermalColdFilter.cpp index cc7fc5b6d..6aea09d9f 100644 --- a/Runtime/Graphics/Shaders/CThermalColdFilter.cpp +++ b/Runtime/Graphics/Shaders/CThermalColdFilter.cpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { static boo::ObjToken s_Pipeline; @@ -55,4 +55,4 @@ void CThermalColdFilter::draw() { CGraphics::DrawArray(0, 4); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CThermalColdFilter.hpp b/Runtime/Graphics/Shaders/CThermalColdFilter.hpp index 5f5754037..122f60bc7 100644 --- a/Runtime/Graphics/Shaders/CThermalColdFilter.hpp +++ b/Runtime/Graphics/Shaders/CThermalColdFilter.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CThermalColdFilter { struct Uniform { @@ -36,4 +36,4 @@ public: void draw(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CThermalHotFilter.cpp b/Runtime/Graphics/Shaders/CThermalHotFilter.cpp index e5f7e45b1..02022b9cc 100644 --- a/Runtime/Graphics/Shaders/CThermalHotFilter.cpp +++ b/Runtime/Graphics/Shaders/CThermalHotFilter.cpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { static boo::ObjToken s_Pipeline; @@ -53,4 +53,4 @@ void CThermalHotFilter::draw() { CGraphics::DrawArray(0, 4); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CThermalHotFilter.hpp b/Runtime/Graphics/Shaders/CThermalHotFilter.hpp index e824d2b90..2eb0d735b 100644 --- a/Runtime/Graphics/Shaders/CThermalHotFilter.hpp +++ b/Runtime/Graphics/Shaders/CThermalHotFilter.hpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { class CThermalHotFilter { struct Uniform { @@ -27,4 +27,4 @@ public: void draw(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CWorldShadowShader.cpp b/Runtime/Graphics/Shaders/CWorldShadowShader.cpp index c161e7496..2004896ef 100644 --- a/Runtime/Graphics/Shaders/CWorldShadowShader.cpp +++ b/Runtime/Graphics/Shaders/CWorldShadowShader.cpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { static boo::ObjToken s_Pipeline; static boo::ObjToken s_ZPipeline; @@ -85,4 +85,4 @@ void CWorldShadowShader::resolveTexture() { CGraphics::g_BooMainCommandQueue->resolveBindTexture(m_tex, rect, false, 0, true, false, true); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CWorldShadowShader.hpp b/Runtime/Graphics/Shaders/CWorldShadowShader.hpp index b63708481..98af3477c 100644 --- a/Runtime/Graphics/Shaders/CWorldShadowShader.hpp +++ b/Runtime/Graphics/Shaders/CWorldShadowShader.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { class CWorldShadowShader { boo::ObjToken m_tex; @@ -43,4 +43,4 @@ public: const boo::ObjToken& GetTexture() const { return m_tex; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CXRayBlurFilter.cpp b/Runtime/Graphics/Shaders/CXRayBlurFilter.cpp index 413301e70..bf39e9160 100644 --- a/Runtime/Graphics/Shaders/CXRayBlurFilter.cpp +++ b/Runtime/Graphics/Shaders/CXRayBlurFilter.cpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { static boo::ObjToken s_Pipeline; @@ -65,4 +65,4 @@ void CXRayBlurFilter::draw(float amount) { CGraphics::DrawArray(0, 4); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp b/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp index 704f9b235..35104fa7b 100644 --- a/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp +++ b/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CTexture; class CXRayBlurFilter { @@ -28,4 +28,4 @@ public: void draw(float amount); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CAuiEnergyBarT01.cpp b/Runtime/GuiSys/CAuiEnergyBarT01.cpp index d30345c86..e01285c93 100644 --- a/Runtime/GuiSys/CAuiEnergyBarT01.cpp +++ b/Runtime/GuiSys/CAuiEnergyBarT01.cpp @@ -4,7 +4,7 @@ #include "Runtime/GuiSys/CGuiSys.hpp" #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp" -namespace urde { +namespace metaforce { CAuiEnergyBarT01::CAuiEnergyBarT01(const CGuiWidgetParms& parms, CSimplePool* sp, CAssetId txtrId) : CGuiWidget(parms), xb8_txtrId(txtrId) { @@ -148,4 +148,4 @@ std::shared_ptr CAuiEnergyBarT01::Create(CGuiFrame* frame, CInputStr return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CAuiEnergyBarT01.hpp b/Runtime/GuiSys/CAuiEnergyBarT01.hpp index 6fca40fba..5c32ab1d7 100644 --- a/Runtime/GuiSys/CAuiEnergyBarT01.hpp +++ b/Runtime/GuiSys/CAuiEnergyBarT01.hpp @@ -12,7 +12,7 @@ #include #include -namespace urde { +namespace metaforce { class CSimplePool; class CAuiEnergyBarT01 : public CGuiWidget { @@ -66,4 +66,4 @@ public: static std::shared_ptr Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CAuiImagePane.cpp b/Runtime/GuiSys/CAuiImagePane.cpp index 6691ac541..30d82ae02 100644 --- a/Runtime/GuiSys/CAuiImagePane.cpp +++ b/Runtime/GuiSys/CAuiImagePane.cpp @@ -5,7 +5,7 @@ #include "Runtime/Graphics/CTexture.hpp" #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp" -namespace urde { +namespace metaforce { CAuiImagePane::CAuiImagePane(const CGuiWidgetParms& parms, CSimplePool* sp, CAssetId tex0, CAssetId tex1, rstl::reserved_vector&& coords, @@ -195,4 +195,4 @@ void CAuiImagePane::SetAnimationParms(const zeus::CVector2f& tileSize, float int x148_fadeDuration = fadeDuration; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CAuiImagePane.hpp b/Runtime/GuiSys/CAuiImagePane.hpp index bf99786ad..a27a44500 100644 --- a/Runtime/GuiSys/CAuiImagePane.hpp +++ b/Runtime/GuiSys/CAuiImagePane.hpp @@ -14,7 +14,7 @@ namespace zeus { class CColor; } -namespace urde { +namespace metaforce { class CSimplePool; class CTexture; @@ -60,4 +60,4 @@ public: void SetDeResFactor(float d) { x14c_deResFactor = d; } void SetFlashFactor(float t) { x150_flashFactor = t; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CAuiMeter.cpp b/Runtime/GuiSys/CAuiMeter.cpp index 724d65584..5addf96dd 100644 --- a/Runtime/GuiSys/CAuiMeter.cpp +++ b/Runtime/GuiSys/CAuiMeter.cpp @@ -5,7 +5,7 @@ #include -namespace urde { +namespace metaforce { CAuiMeter::CAuiMeter(const CGuiWidgetParms& parms, bool noRoundUp, u32 maxCapacity, u32 workerCount) : CGuiGroup(parms, 0, false), xc4_noRoundUp(noRoundUp), xc8_maxCapacity(maxCapacity), xcc_capacity(maxCapacity) { @@ -98,4 +98,4 @@ std::shared_ptr CAuiMeter::Create(CGuiFrame* frame, CInputStream& in return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CAuiMeter.hpp b/Runtime/GuiSys/CAuiMeter.hpp index be0b83eae..e791395bb 100644 --- a/Runtime/GuiSys/CAuiMeter.hpp +++ b/Runtime/GuiSys/CAuiMeter.hpp @@ -6,7 +6,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/GuiSys/CGuiGroup.hpp" -namespace urde { +namespace metaforce { class CSimplePool; class CAuiMeter : public CGuiGroup { @@ -31,4 +31,4 @@ public: static std::shared_ptr Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CCompoundTargetReticle.cpp b/Runtime/GuiSys/CCompoundTargetReticle.cpp index 9fcbd19e7..f975d03fc 100644 --- a/Runtime/GuiSys/CCompoundTargetReticle.cpp +++ b/Runtime/GuiSys/CCompoundTargetReticle.cpp @@ -12,7 +12,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { namespace { constexpr char skCrosshairsReticleAssetName[] = "CMDL_Crosshairs"; [[maybe_unused]] constexpr char skOrbitZoneReticleAssetName[] = "CMDL_OrbitZone"; @@ -1070,4 +1070,4 @@ void CCompoundTargetReticle::Touch() { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CCompoundTargetReticle.hpp b/Runtime/GuiSys/CCompoundTargetReticle.hpp index dd70eb2b4..6742e7eb8 100644 --- a/Runtime/GuiSys/CCompoundTargetReticle.hpp +++ b/Runtime/GuiSys/CCompoundTargetReticle.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CActor; class CModel; class CScriptGrapplePoint; @@ -158,4 +158,4 @@ public: static float CalculateClampedScale(const zeus::CVector3f&, float, float, float, const CStateManager&); void Touch(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CConsoleOutputWindow.cpp b/Runtime/GuiSys/CConsoleOutputWindow.cpp index f010c5de3..ee7cb8fbf 100644 --- a/Runtime/GuiSys/CConsoleOutputWindow.cpp +++ b/Runtime/GuiSys/CConsoleOutputWindow.cpp @@ -1,7 +1,7 @@ #include "Runtime/GuiSys/CConsoleOutputWindow.hpp" #include "Runtime/Graphics/CGraphics.hpp" -namespace urde { +namespace metaforce { CConsoleOutputWindow::CConsoleOutputWindow(int, float, float) : CIOWin("Console Output Window") {} @@ -13,4 +13,4 @@ void CConsoleOutputWindow::Draw() { //SCOPED_GRAPHICS_DEBUG_GROUP("CConsoleOutputWindow::Draw", zeus::skGreen); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CConsoleOutputWindow.hpp b/Runtime/GuiSys/CConsoleOutputWindow.hpp index 40a8bb69f..5f2927495 100644 --- a/Runtime/GuiSys/CConsoleOutputWindow.hpp +++ b/Runtime/GuiSys/CConsoleOutputWindow.hpp @@ -2,7 +2,7 @@ #include "Runtime/CIOWin.hpp" -namespace urde { +namespace metaforce { class CConsoleOutputWindow : public CIOWin { public: @@ -11,4 +11,4 @@ public: void Draw() override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CDrawStringOptions.hpp b/Runtime/GuiSys/CDrawStringOptions.hpp index 749aa2882..7dfc72758 100644 --- a/Runtime/GuiSys/CDrawStringOptions.hpp +++ b/Runtime/GuiSys/CDrawStringOptions.hpp @@ -4,7 +4,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/GuiSys/CGuiTextSupport.hpp" -namespace urde { +namespace metaforce { class CDrawStringOptions { friend class CColorOverrideInstruction; @@ -21,4 +21,4 @@ public: CDrawStringOptions() : x4_colors(16) {} }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CErrorOutputWindow.cpp b/Runtime/GuiSys/CErrorOutputWindow.cpp index aae8942d9..0bccee052 100644 --- a/Runtime/GuiSys/CErrorOutputWindow.cpp +++ b/Runtime/GuiSys/CErrorOutputWindow.cpp @@ -2,7 +2,7 @@ #include "Runtime/Graphics/CGraphics.hpp" -namespace urde { +namespace metaforce { CErrorOutputWindow::CErrorOutputWindow(bool flag) : CIOWin("Error Output Window") { x18_24_ = false; @@ -20,4 +20,4 @@ void CErrorOutputWindow::Draw() { //SCOPED_GRAPHICS_DEBUG_GROUP("CErrorOutputWindow::Draw", zeus::skGreen); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CErrorOutputWindow.hpp b/Runtime/GuiSys/CErrorOutputWindow.hpp index b6088a9ba..dd85bd38a 100644 --- a/Runtime/GuiSys/CErrorOutputWindow.hpp +++ b/Runtime/GuiSys/CErrorOutputWindow.hpp @@ -3,7 +3,7 @@ #include "Runtime/CIOWin.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CErrorOutputWindow : public CIOWin { public: @@ -25,4 +25,4 @@ public: void Draw() override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CFontImageDef.cpp b/Runtime/GuiSys/CFontImageDef.cpp index 7a0db90b1..56b5e4b7c 100644 --- a/Runtime/GuiSys/CFontImageDef.cpp +++ b/Runtime/GuiSys/CFontImageDef.cpp @@ -4,7 +4,7 @@ #include "Runtime/Graphics/CTexture.hpp" -namespace urde { +namespace metaforce { CFontImageDef::CFontImageDef(const std::vector>& texs, float interval, const zeus::CVector2f& cropFactor) @@ -35,4 +35,4 @@ s32 CFontImageDef::CalculateHeight() const { return scaledH - (scaledH - CalculateBaseline()); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CFontImageDef.hpp b/Runtime/GuiSys/CFontImageDef.hpp index 80355cd4f..44d477932 100644 --- a/Runtime/GuiSys/CFontImageDef.hpp +++ b/Runtime/GuiSys/CFontImageDef.hpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { class CTexture; class CFontImageDef { @@ -22,4 +22,4 @@ public: s32 CalculateHeight() const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CFontRenderState.cpp b/Runtime/GuiSys/CFontRenderState.cpp index ef91455e0..ebe70893c 100644 --- a/Runtime/GuiSys/CFontRenderState.cpp +++ b/Runtime/GuiSys/CFontRenderState.cpp @@ -2,7 +2,7 @@ #include "Runtime/GuiSys/CRasterFont.hpp" -namespace urde { +namespace metaforce { CFontRenderState::CFontRenderState() { x54_colors[0] = zeus::skWhite; @@ -81,4 +81,4 @@ void CFontRenderState::RefreshColor(EColorType tp) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CFontRenderState.hpp b/Runtime/GuiSys/CFontRenderState.hpp index ec42f469f..9a4e64044 100644 --- a/Runtime/GuiSys/CFontRenderState.hpp +++ b/Runtime/GuiSys/CFontRenderState.hpp @@ -7,7 +7,7 @@ #include "Runtime/GuiSys/CGuiTextSupport.hpp" #include "Runtime/GuiSys/CSaveableState.hpp" -namespace urde { +namespace metaforce { class CBlockInstruction; class CLineInstruction; @@ -38,4 +38,4 @@ public: void RefreshColor(EColorType tp); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiCamera.cpp b/Runtime/GuiSys/CGuiCamera.cpp index 521fd7134..b5ade0c7f 100644 --- a/Runtime/GuiSys/CGuiCamera.cpp +++ b/Runtime/GuiSys/CGuiCamera.cpp @@ -4,7 +4,7 @@ #include "Runtime/GuiSys/CGuiFrame.hpp" #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp" -namespace urde { +namespace metaforce { CGuiCamera::CGuiCamera(const CGuiWidgetParms& parms, float left, float right, float top, float bottom, float znear, float zfar) @@ -65,4 +65,4 @@ std::shared_ptr CGuiCamera::Create(CGuiFrame* frame, CInputStream& i return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiCamera.hpp b/Runtime/GuiSys/CGuiCamera.hpp index 824a55c7e..f44885bc4 100644 --- a/Runtime/GuiSys/CGuiCamera.hpp +++ b/Runtime/GuiSys/CGuiCamera.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/GuiSys/CGuiWidget.hpp" -namespace urde { +namespace metaforce { class CSimplePool; class CGuiCamera : public CGuiWidget { @@ -53,4 +53,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiCompoundWidget.cpp b/Runtime/GuiSys/CGuiCompoundWidget.cpp index 27aefb6a6..179bba7d5 100644 --- a/Runtime/GuiSys/CGuiCompoundWidget.cpp +++ b/Runtime/GuiSys/CGuiCompoundWidget.cpp @@ -1,6 +1,6 @@ #include "Runtime/GuiSys/CGuiCompoundWidget.hpp" -namespace urde { +namespace metaforce { CGuiCompoundWidget::CGuiCompoundWidget(const CGuiWidgetParms& parms) : CGuiWidget(parms) {} @@ -32,4 +32,4 @@ CGuiWidget* CGuiCompoundWidget::GetWorkerWidget(int id) const { return nullptr; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiCompoundWidget.hpp b/Runtime/GuiSys/CGuiCompoundWidget.hpp index 97752f7fe..878b017c4 100644 --- a/Runtime/GuiSys/CGuiCompoundWidget.hpp +++ b/Runtime/GuiSys/CGuiCompoundWidget.hpp @@ -2,7 +2,7 @@ #include "Runtime/GuiSys/CGuiWidget.hpp" -namespace urde { +namespace metaforce { class CGuiCompoundWidget : public CGuiWidget { public: @@ -14,4 +14,4 @@ public: virtual CGuiWidget* GetWorkerWidget(int id) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiFrame.cpp b/Runtime/GuiSys/CGuiFrame.cpp index 221870588..91cfc8d4a 100644 --- a/Runtime/GuiSys/CGuiFrame.cpp +++ b/Runtime/GuiSys/CGuiFrame.cpp @@ -14,7 +14,7 @@ #include -namespace urde { +namespace metaforce { CGuiFrame::CGuiFrame(CAssetId id, CGuiSys& sys, int a, int b, int c, CSimplePool* sp) : x0_id(id), x8_guiSys(sys), x4c_a(a), x50_b(b), x54_c(c) { @@ -284,4 +284,4 @@ std::unique_ptr RGuiFrameFactoryInGame(const SObjectTag& tag, CInputStream return TToken::GetIObjObjectFor(std::move(frame)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiFrame.hpp b/Runtime/GuiSys/CGuiFrame.hpp index d1516ca6a..6a2559394 100644 --- a/Runtime/GuiSys/CGuiFrame.hpp +++ b/Runtime/GuiSys/CGuiFrame.hpp @@ -12,7 +12,7 @@ #include -namespace urde { +namespace metaforce { class CBooModel; class CGuiCamera; class CGuiLight; @@ -114,4 +114,4 @@ public: std::unique_ptr RGuiFrameFactoryInGame(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiGroup.cpp b/Runtime/GuiSys/CGuiGroup.cpp index 9a6bda8fc..105387c3d 100644 --- a/Runtime/GuiSys/CGuiGroup.cpp +++ b/Runtime/GuiSys/CGuiGroup.cpp @@ -1,6 +1,6 @@ #include "Runtime/GuiSys/CGuiGroup.hpp" -namespace urde { +namespace metaforce { void CGuiGroup::LoadWidgetFnMap() {} @@ -50,4 +50,4 @@ std::shared_ptr CGuiGroup::Create(CGuiFrame* frame, CInputStream& in return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiGroup.hpp b/Runtime/GuiSys/CGuiGroup.hpp index 9a1bc4f43..964300b07 100644 --- a/Runtime/GuiSys/CGuiGroup.hpp +++ b/Runtime/GuiSys/CGuiGroup.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/GuiSys/CGuiCompoundWidget.hpp" -namespace urde { +namespace metaforce { class CGuiGroup : public CGuiCompoundWidget { u32 xb8_workerCount = 0; @@ -24,4 +24,4 @@ public: static void LoadWidgetFnMap(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiHeadWidget.cpp b/Runtime/GuiSys/CGuiHeadWidget.cpp index 42edb8be9..d64815e87 100644 --- a/Runtime/GuiSys/CGuiHeadWidget.cpp +++ b/Runtime/GuiSys/CGuiHeadWidget.cpp @@ -1,7 +1,7 @@ #include "Runtime/GuiSys/CGuiHeadWidget.hpp" #include "Runtime/GuiSys/CGuiFrame.hpp" -namespace urde { +namespace metaforce { CGuiHeadWidget::CGuiHeadWidget(const CGuiWidgetParms& parms) : CGuiWidget(parms) {} @@ -13,4 +13,4 @@ std::shared_ptr CGuiHeadWidget::Create(CGuiFrame* frame, CInputStrea return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiHeadWidget.hpp b/Runtime/GuiSys/CGuiHeadWidget.hpp index cd710fe2c..89536b530 100644 --- a/Runtime/GuiSys/CGuiHeadWidget.hpp +++ b/Runtime/GuiSys/CGuiHeadWidget.hpp @@ -2,7 +2,7 @@ #include "Runtime/GuiSys/CGuiWidget.hpp" -namespace urde { +namespace metaforce { class CGuiHeadWidget : public CGuiWidget { public: @@ -15,4 +15,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiLight.cpp b/Runtime/GuiSys/CGuiLight.cpp index c1299931b..c65166b55 100644 --- a/Runtime/GuiSys/CGuiLight.cpp +++ b/Runtime/GuiSys/CGuiLight.cpp @@ -1,7 +1,7 @@ #include "Runtime/GuiSys/CGuiLight.hpp" #include "Runtime/GuiSys/CGuiFrame.hpp" -namespace urde { +namespace metaforce { CGuiLight::CGuiLight(const CGuiWidgetParms& parms, const CLight& light) : CGuiWidget(parms) @@ -93,4 +93,4 @@ std::shared_ptr CGuiLight::Create(CGuiFrame* frame, CInputStream& in return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiLight.hpp b/Runtime/GuiSys/CGuiLight.hpp index 2a077df11..b93e79fdd 100644 --- a/Runtime/GuiSys/CGuiLight.hpp +++ b/Runtime/GuiSys/CGuiLight.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { class CSimplePool; class CGuiLight : public CGuiWidget { @@ -48,4 +48,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiModel.cpp b/Runtime/GuiSys/CGuiModel.cpp index c8d1ef9c3..8ea304413 100644 --- a/Runtime/GuiSys/CGuiModel.cpp +++ b/Runtime/GuiSys/CGuiModel.cpp @@ -6,7 +6,7 @@ #include "Runtime/GuiSys/CGuiSys.hpp" #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp" -namespace urde { +namespace metaforce { CGuiModel::CGuiModel(const CGuiWidgetParms& parms, CSimplePool* sp, CAssetId modelId, u32 lightMask, bool flag) : CGuiWidget(parms), xc8_modelId(modelId), xcc_lightMask(lightMask) { @@ -130,4 +130,4 @@ std::shared_ptr CGuiModel::Create(CGuiFrame* frame, CInputStream& in return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiModel.hpp b/Runtime/GuiSys/CGuiModel.hpp index 024c9ba25..863c61027 100644 --- a/Runtime/GuiSys/CGuiModel.hpp +++ b/Runtime/GuiSys/CGuiModel.hpp @@ -6,7 +6,7 @@ #include "Runtime/Graphics/CModel.hpp" #include "Runtime/GuiSys/CGuiWidget.hpp" -namespace urde { +namespace metaforce { class CSimplePool; class CGuiModel : public CGuiWidget { @@ -28,4 +28,4 @@ public: static std::shared_ptr Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiObject.cpp b/Runtime/GuiSys/CGuiObject.cpp index 157540949..b963011c4 100644 --- a/Runtime/GuiSys/CGuiObject.cpp +++ b/Runtime/GuiSys/CGuiObject.cpp @@ -2,7 +2,7 @@ #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp" -namespace urde { +namespace metaforce { void CGuiObject::Update(float dt) { if (x68_child) @@ -117,4 +117,4 @@ void CGuiObject::SetLocalTransform(const zeus::CTransform& xf) { RecalculateTransforms(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiObject.hpp b/Runtime/GuiSys/CGuiObject.hpp index 298cd756d..ce3cffd97 100644 --- a/Runtime/GuiSys/CGuiObject.hpp +++ b/Runtime/GuiSys/CGuiObject.hpp @@ -6,7 +6,7 @@ #include #include -namespace urde { +namespace metaforce { struct CGuiWidgetDrawParms; class CGuiObject : public std::enable_shared_from_this { @@ -48,4 +48,4 @@ public: void SetLocalTransform(const zeus::CTransform& xf); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiPane.cpp b/Runtime/GuiSys/CGuiPane.cpp index 86abb0467..27a73ee7b 100644 --- a/Runtime/GuiSys/CGuiPane.cpp +++ b/Runtime/GuiSys/CGuiPane.cpp @@ -1,6 +1,6 @@ #include "Runtime/GuiSys/CGuiPane.hpp" -namespace urde { +namespace metaforce { CGuiPane::CGuiPane(const CGuiWidgetParms& parms, const zeus::CVector2f& dim, const zeus::CVector3f& scaleCenter) : CGuiWidget(parms), xb8_dim(dim), xc8_scaleCenter(scaleCenter) { @@ -46,4 +46,4 @@ std::shared_ptr CGuiPane::Create(CGuiFrame* frame, CInputStream& in, return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiPane.hpp b/Runtime/GuiSys/CGuiPane.hpp index 90bdb4729..5d5ccd76c 100644 --- a/Runtime/GuiSys/CGuiPane.hpp +++ b/Runtime/GuiSys/CGuiPane.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { class CGuiPane : public CGuiWidget { protected: @@ -35,4 +35,4 @@ public: static std::shared_ptr Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiSliderGroup.cpp b/Runtime/GuiSys/CGuiSliderGroup.cpp index bc9438412..df7aef83c 100644 --- a/Runtime/GuiSys/CGuiSliderGroup.cpp +++ b/Runtime/GuiSys/CGuiSliderGroup.cpp @@ -3,7 +3,7 @@ #include "Runtime/GuiSys/CGuiModel.hpp" #include "Runtime/Input/CFinalInput.hpp" -namespace urde { +namespace metaforce { CGuiSliderGroup::CGuiSliderGroup(const CGuiWidgetParms& parms, float min, float max, float def, float inc) : CGuiCompoundWidget(parms) @@ -168,4 +168,4 @@ std::shared_ptr CGuiSliderGroup::Create(CGuiFrame* frame, CInputStre return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiSliderGroup.hpp b/Runtime/GuiSys/CGuiSliderGroup.hpp index 22c2470ad..7d34ec24b 100644 --- a/Runtime/GuiSys/CGuiSliderGroup.hpp +++ b/Runtime/GuiSys/CGuiSliderGroup.hpp @@ -6,7 +6,7 @@ #include "Runtime/GuiSys/CGuiCompoundWidget.hpp" -namespace urde { +namespace metaforce { class CSimplePool; class CGuiSliderGroup : public CGuiCompoundWidget { @@ -60,4 +60,4 @@ public: static std::shared_ptr Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiSys.cpp b/Runtime/GuiSys/CGuiSys.cpp index 1888da21b..6010d6527 100644 --- a/Runtime/GuiSys/CGuiSys.cpp +++ b/Runtime/GuiSys/CGuiSys.cpp @@ -18,7 +18,7 @@ #include "Runtime/GuiSys/CTextExecuteBuffer.hpp" #include "Runtime/GuiSys/CTextParser.hpp" -namespace urde { +namespace metaforce { CGuiSys* g_GuiSys = nullptr; CTextExecuteBuffer* g_TextExecuteBuf = nullptr; @@ -92,4 +92,4 @@ void CGuiSys::ViewportResizeFrame(CGuiFrame* frame) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiSys.hpp b/Runtime/GuiSys/CGuiSys.hpp index d82cc5aa8..5ce5036d8 100644 --- a/Runtime/GuiSys/CGuiSys.hpp +++ b/Runtime/GuiSys/CGuiSys.hpp @@ -10,7 +10,7 @@ #include -namespace urde { +namespace metaforce { class CGuiFrame; class CGuiObject; class CGuiWidget; @@ -58,4 +58,4 @@ extern CTextExecuteBuffer* g_TextExecuteBuf; /** Global CTextParser instance */ extern CTextParser* g_TextParser; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiTableGroup.cpp b/Runtime/GuiSys/CGuiTableGroup.cpp index 83a7848c7..671188df9 100644 --- a/Runtime/GuiSys/CGuiTableGroup.cpp +++ b/Runtime/GuiSys/CGuiTableGroup.cpp @@ -1,7 +1,7 @@ #include "Runtime/GuiSys/CGuiTableGroup.hpp" #include "Runtime/Input/CFinalInput.hpp" -namespace urde { +namespace metaforce { bool CGuiTableGroup::CRepeatState::Update(float dt, bool state) { if (x0_timer == 0.f) { @@ -228,4 +228,4 @@ std::shared_ptr CGuiTableGroup::Create(CGuiFrame* frame, CInputStrea return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiTableGroup.hpp b/Runtime/GuiSys/CGuiTableGroup.hpp index 4f4b3d0f3..8bb8a5dc2 100644 --- a/Runtime/GuiSys/CGuiTableGroup.hpp +++ b/Runtime/GuiSys/CGuiTableGroup.hpp @@ -5,7 +5,7 @@ #include "Runtime/GuiSys/CGuiCompoundWidget.hpp" -namespace urde { +namespace metaforce { class CGuiTableGroup : public CGuiCompoundWidget { public: @@ -94,4 +94,4 @@ public: static std::shared_ptr Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiTextPane.cpp b/Runtime/GuiSys/CGuiTextPane.cpp index dafb36b8b..8cff5cf46 100644 --- a/Runtime/GuiSys/CGuiTextPane.cpp +++ b/Runtime/GuiSys/CGuiTextPane.cpp @@ -9,7 +9,7 @@ #include "Runtime/GuiSys/CGuiSys.hpp" #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp" -namespace urde { +namespace metaforce { namespace { constexpr std::array NormalPoints{{ {0.f, 0.f, -1.f}, @@ -154,4 +154,4 @@ std::shared_ptr CGuiTextPane::Create(CGuiFrame* frame, CInputStream& return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiTextPane.hpp b/Runtime/GuiSys/CGuiTextPane.hpp index ba8281188..d304e5316 100644 --- a/Runtime/GuiSys/CGuiTextPane.hpp +++ b/Runtime/GuiSys/CGuiTextPane.hpp @@ -6,7 +6,7 @@ #include "Runtime/GuiSys/CGuiPane.hpp" #include "Runtime/GuiSys/CGuiTextSupport.hpp" -namespace urde { +namespace metaforce { class CGuiTextPane : public CGuiPane { CGuiTextSupport xd4_textSupport; @@ -30,4 +30,4 @@ public: static std::shared_ptr Create(CGuiFrame* frame, CInputStream& in, CSimplePool* sp); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiTextSupport.cpp b/Runtime/GuiSys/CGuiTextSupport.cpp index 7a93a8e9b..a34ceea0f 100644 --- a/Runtime/GuiSys/CGuiTextSupport.cpp +++ b/Runtime/GuiSys/CGuiTextSupport.cpp @@ -9,7 +9,7 @@ #include "Runtime/GuiSys/CTextExecuteBuffer.hpp" #include "Runtime/GuiSys/CTextParser.hpp" -namespace urde { +namespace metaforce { CGuiTextSupport::CGuiTextSupport(CAssetId fontId, const CGuiTextProperties& props, const zeus::CColor& fontCol, const zeus::CColor& outlineCol, const zeus::CColor& geomCol, s32 padX, s32 padY, @@ -344,4 +344,4 @@ void CGuiTextSupport::SetPage(int page) { x3c_curTime = 0.f; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiTextSupport.hpp b/Runtime/GuiSys/CGuiTextSupport.hpp index f612cac1c..8e7cc85d6 100644 --- a/Runtime/GuiSys/CGuiTextSupport.hpp +++ b/Runtime/GuiSys/CGuiTextSupport.hpp @@ -14,7 +14,7 @@ #include -namespace urde { +namespace metaforce { class CSimplePool; class CTextExecuteBuffer; class CTextRenderBuffer; @@ -138,4 +138,4 @@ public: void SetPage(int page); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiWidget.cpp b/Runtime/GuiSys/CGuiWidget.cpp index 66a14d0c8..a3ec88dc2 100644 --- a/Runtime/GuiSys/CGuiWidget.cpp +++ b/Runtime/GuiSys/CGuiWidget.cpp @@ -3,8 +3,8 @@ #include -namespace urde { -static logvisor::Module Log("urde::CGuiWidget"); +namespace metaforce { +static logvisor::Module Log("metaforce::CGuiWidget"); CGuiWidget::CGuiWidget(const CGuiWidgetParms& parms) : x70_selfId(parms.x6_selfId) @@ -257,4 +257,4 @@ void CGuiWidget::SetIsActive(bool active) { OnActiveChange(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiWidget.hpp b/Runtime/GuiSys/CGuiWidget.hpp index ee0c18a9e..add4c810a 100644 --- a/Runtime/GuiSys/CGuiWidget.hpp +++ b/Runtime/GuiSys/CGuiWidget.hpp @@ -14,7 +14,7 @@ #include #include -namespace urde { +namespace metaforce { class CGuiFrame; class CGuiTextSupport; struct CFinalInput; @@ -144,4 +144,4 @@ public: CGuiFrame* GetGuiFrame() const { return xb0_frame; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiWidgetDrawParms.hpp b/Runtime/GuiSys/CGuiWidgetDrawParms.hpp index ef1347e30..78cb2b901 100644 --- a/Runtime/GuiSys/CGuiWidgetDrawParms.hpp +++ b/Runtime/GuiSys/CGuiWidgetDrawParms.hpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { struct CGuiWidgetDrawParms { float x0_alphaMod = 1.f; @@ -15,4 +15,4 @@ struct CGuiWidgetDrawParms { static constexpr CGuiWidgetDrawParms Default() { return {}; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiWidgetIdDB.cpp b/Runtime/GuiSys/CGuiWidgetIdDB.cpp index 4455cc85a..972d1450e 100644 --- a/Runtime/GuiSys/CGuiWidgetIdDB.cpp +++ b/Runtime/GuiSys/CGuiWidgetIdDB.cpp @@ -1,6 +1,6 @@ #include "Runtime/GuiSys/CGuiWidgetIdDB.hpp" -namespace urde { +namespace metaforce { CGuiWidgetIdDB::CGuiWidgetIdDB() { AddWidget("kGSYS_DummyWidgetID", 0); @@ -38,4 +38,4 @@ s16 CGuiWidgetIdDB::AddWidget(std::string_view name) { return findId; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CGuiWidgetIdDB.hpp b/Runtime/GuiSys/CGuiWidgetIdDB.hpp index 65197094c..d048ef30a 100644 --- a/Runtime/GuiSys/CGuiWidgetIdDB.hpp +++ b/Runtime/GuiSys/CGuiWidgetIdDB.hpp @@ -5,7 +5,7 @@ #include #include "Runtime/GCNTypes.hpp" -namespace urde { +namespace metaforce { class CGuiWidgetIdDB { std::unordered_map x0_dbMap; @@ -18,4 +18,4 @@ public: s16 AddWidget(std::string_view name); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudBallInterface.cpp b/Runtime/GuiSys/CHudBallInterface.cpp index 74677b489..fde28f18d 100644 --- a/Runtime/GuiSys/CHudBallInterface.cpp +++ b/Runtime/GuiSys/CHudBallInterface.cpp @@ -7,7 +7,7 @@ #include "Runtime/GuiSys/CGuiModel.hpp" #include "Runtime/GuiSys/CGuiTextPane.hpp" -namespace urde { +namespace metaforce { CHudBallInterface::CHudBallInterface(CGuiFrame& selHud, int pbAmount, int pbCapacity, int availableBombs, bool hasBombs, bool hasPb) @@ -97,4 +97,4 @@ void CHudBallInterface::SetBallModeFactor(float t) { zeus::CTransform::Translate(x34_camPos + zeus::CVector3f(0.f, 0.f, (t * tmp - tmp) * 0.01f))); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudBallInterface.hpp b/Runtime/GuiSys/CHudBallInterface.hpp index 818154df4..dc1c4e5ad 100644 --- a/Runtime/GuiSys/CHudBallInterface.hpp +++ b/Runtime/GuiSys/CHudBallInterface.hpp @@ -3,7 +3,7 @@ #include "Runtime/rstl.hpp" #include -namespace urde { +namespace metaforce { class CGuiCamera; class CGuiFrame; class CGuiModel; @@ -31,4 +31,4 @@ public: void SetBallModeFactor(float t); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudBossEnergyInterface.cpp b/Runtime/GuiSys/CHudBossEnergyInterface.cpp index 0a0a30bbd..1dba88b44 100644 --- a/Runtime/GuiSys/CHudBossEnergyInterface.cpp +++ b/Runtime/GuiSys/CHudBossEnergyInterface.cpp @@ -5,7 +5,7 @@ #include "Runtime/GuiSys/CGuiFrame.hpp" #include "Runtime/GuiSys/CGuiTextPane.hpp" -namespace urde { +namespace metaforce { CHudBossEnergyInterface::CHudBossEnergyInterface(CGuiFrame& selHud) { x14_basewidget_bossenergystuff = selHud.FindWidget("basewidget_bossenergystuff"); @@ -54,4 +54,4 @@ std::pair CHudBossEnergyInterface::BossEnergyC return {zeus::CVector3f(x, 0.f, 0.f), zeus::CVector3f(x, 0.f, 0.4f)}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudBossEnergyInterface.hpp b/Runtime/GuiSys/CHudBossEnergyInterface.hpp index 57a586a31..0d9b5a907 100644 --- a/Runtime/GuiSys/CHudBossEnergyInterface.hpp +++ b/Runtime/GuiSys/CHudBossEnergyInterface.hpp @@ -3,7 +3,7 @@ #include "Runtime/RetroTypes.hpp" #include -namespace urde { +namespace metaforce { class CAuiEnergyBarT01; class CGuiFrame; class CGuiTextPane; @@ -27,4 +27,4 @@ public: static std::pair BossEnergyCoordFunc(float t); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudDecoInterface.cpp b/Runtime/GuiSys/CHudDecoInterface.cpp index 0a1e77a81..cbc572a9c 100644 --- a/Runtime/GuiSys/CHudDecoInterface.cpp +++ b/Runtime/GuiSys/CHudDecoInterface.cpp @@ -12,7 +12,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { void IHudDecoInterface::SetReticuleTransform(const zeus::CMatrix3f& xf) {} void IHudDecoInterface::SetDecoRotation(float angle) {} @@ -536,4 +536,4 @@ void CHudDecoInterfaceThermal::UpdateHudAlpha() { x78_basewidget_pivot->SetColor(color); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudDecoInterface.hpp b/Runtime/GuiSys/CHudDecoInterface.hpp index f31e4f558..59c6a6669 100644 --- a/Runtime/GuiSys/CHudDecoInterface.hpp +++ b/Runtime/GuiSys/CHudDecoInterface.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class CGuiFrame; struct CFinalInput; class CStateManager; @@ -187,4 +187,4 @@ public: void UpdateHudAlpha() override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudEnergyInterface.cpp b/Runtime/GuiSys/CHudEnergyInterface.cpp index 64144dcfa..abfeab6bd 100644 --- a/Runtime/GuiSys/CHudEnergyInterface.cpp +++ b/Runtime/GuiSys/CHudEnergyInterface.cpp @@ -10,7 +10,7 @@ #include "Runtime/GuiSys/CGuiTextPane.hpp" #include "Runtime/GuiSys/CStringTable.hpp" -namespace urde { +namespace metaforce { constexpr std::array CoordFuncs{ CHudEnergyInterface::CombatEnergyCoordFunc, CHudEnergyInterface::CombatEnergyCoordFunc, @@ -171,4 +171,4 @@ std::pair CHudEnergyInterface::BallEnergyCoord return {zeus::CVector3f(x, 0.f, 0.f), zeus::CVector3f(x, 0.f, 0.088887997f)}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudEnergyInterface.hpp b/Runtime/GuiSys/CHudEnergyInterface.hpp index deacdd906..798a22ecc 100644 --- a/Runtime/GuiSys/CHudEnergyInterface.hpp +++ b/Runtime/GuiSys/CHudEnergyInterface.hpp @@ -4,7 +4,7 @@ #include "Runtime/GuiSys/CHudInterface.hpp" #include -namespace urde { +namespace metaforce { class CAuiEnergyBarT01; class CAuiMeter; class CGuiFrame; @@ -43,4 +43,4 @@ public: static std::pair BallEnergyCoordFunc(float t); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudFreeLookInterface.cpp b/Runtime/GuiSys/CHudFreeLookInterface.cpp index bd9735ad9..cdef057cb 100644 --- a/Runtime/GuiSys/CHudFreeLookInterface.cpp +++ b/Runtime/GuiSys/CHudFreeLookInterface.cpp @@ -4,7 +4,7 @@ #include "Runtime/GuiSys/CGuiFrame.hpp" #include "Runtime/GuiSys/CGuiModel.hpp" -namespace urde { +namespace metaforce { CHudFreeLookInterface::CHudFreeLookInterface(CGuiFrame& selHud, EHudType hudType, bool inFreeLook, bool lookControlHeld, bool lockedOnObj) @@ -145,4 +145,4 @@ void CHudFreeLookInterfaceXRay::SetFreeLookState(bool inFreeLook, bool lookContr x24_basewidget_freelook->SetVisibility(visible, ETraversalMode::Children); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudFreeLookInterface.hpp b/Runtime/GuiSys/CHudFreeLookInterface.hpp index 3494a2132..aa175b8fc 100644 --- a/Runtime/GuiSys/CHudFreeLookInterface.hpp +++ b/Runtime/GuiSys/CHudFreeLookInterface.hpp @@ -4,7 +4,7 @@ #include "Runtime/GuiSys/CHudInterface.hpp" #include -namespace urde { +namespace metaforce { class CGuiFrame; class CGuiModel; class CGuiWidget; @@ -68,4 +68,4 @@ public: void SetFreeLookState(bool inFreeLook, bool lookControlHeld, bool lockedOnObj, float vertLookAngle) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudHelmetInterface.cpp b/Runtime/GuiSys/CHudHelmetInterface.cpp index f28dfecaf..6bdb0fdfe 100644 --- a/Runtime/GuiSys/CHudHelmetInterface.cpp +++ b/Runtime/GuiSys/CHudHelmetInterface.cpp @@ -5,7 +5,7 @@ #include "Runtime/GuiSys/CGuiCamera.hpp" #include "Runtime/GuiSys/CGuiFrame.hpp" -namespace urde { +namespace metaforce { CHudHelmetInterface::CHudHelmetInterface(CGuiFrame& helmetFrame) { x40_camera = helmetFrame.GetFrameCamera(); @@ -60,4 +60,4 @@ void CHudHelmetInterface::SetIsVisibleDebug(bool helmet, bool glow) { UpdateVisibility(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudHelmetInterface.hpp b/Runtime/GuiSys/CHudHelmetInterface.hpp index 0d34a9f35..489986e8a 100644 --- a/Runtime/GuiSys/CHudHelmetInterface.hpp +++ b/Runtime/GuiSys/CHudHelmetInterface.hpp @@ -3,7 +3,7 @@ #include "Runtime/RetroTypes.hpp" #include -namespace urde { +namespace metaforce { class CGuiCamera; class CGuiFrame; class CGuiWidget; @@ -35,4 +35,4 @@ public: void SetIsVisibleDebug(bool helmet, bool glow); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudInterface.hpp b/Runtime/GuiSys/CHudInterface.hpp index 411d717e9..866dd2c89 100644 --- a/Runtime/GuiSys/CHudInterface.hpp +++ b/Runtime/GuiSys/CHudInterface.hpp @@ -1,6 +1,6 @@ #pragma once -namespace urde { +namespace metaforce { enum class EHudType { Combat, Scan, XRay, Thermal, Ball }; diff --git a/Runtime/GuiSys/CHudMissileInterface.cpp b/Runtime/GuiSys/CHudMissileInterface.cpp index 45d5a9425..ab530339e 100644 --- a/Runtime/GuiSys/CHudMissileInterface.cpp +++ b/Runtime/GuiSys/CHudMissileInterface.cpp @@ -10,7 +10,7 @@ #include "Runtime/GuiSys/CGuiTextPane.hpp" #include "Runtime/GuiSys/CStringTable.hpp" -namespace urde { +namespace metaforce { constexpr std::array CoordFuncs{ CHudMissileInterface::CombatMissileBarCoordFunc, nullptr, CHudMissileInterface::XRayMissileBarCoordFunc, @@ -266,4 +266,4 @@ std::pair CHudMissileInterface::ThermalMissile return {zeus::CVector3f(-0.5f * c - 0.1f, 0.f, b), zeus::CVector3f(-0.1f, 0.f, b)}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudMissileInterface.hpp b/Runtime/GuiSys/CHudMissileInterface.hpp index 33e27b012..4966aad66 100644 --- a/Runtime/GuiSys/CHudMissileInterface.hpp +++ b/Runtime/GuiSys/CHudMissileInterface.hpp @@ -4,7 +4,7 @@ #include "Runtime/GuiSys/CHudInterface.hpp" #include -namespace urde { +namespace metaforce { class CAuiEnergyBarT01; class CGuiFrame; class CGuiModel; @@ -56,4 +56,4 @@ public: static std::pair ThermalMissileBarCoordFunc(float t); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudRadarInterface.cpp b/Runtime/GuiSys/CHudRadarInterface.cpp index cd00e18b5..9392b02fd 100644 --- a/Runtime/GuiSys/CHudRadarInterface.cpp +++ b/Runtime/GuiSys/CHudRadarInterface.cpp @@ -16,7 +16,7 @@ #include -namespace urde { +namespace metaforce { CHudRadarInterface::CHudRadarInterface(CGuiFrame& baseHud, CStateManager& stateMgr) { x0_txtrRadarPaint = g_SimplePool->GetObj("TXTR_RadarPaint"); @@ -159,4 +159,4 @@ void CHudRadarInterface::Draw(const CStateManager& mgr, float alpha) { m_paintShader.draw(m_paintInsts, x0_txtrRadarPaint.GetObj()); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudRadarInterface.hpp b/Runtime/GuiSys/CHudRadarInterface.hpp index 159342dc5..05bc01caf 100644 --- a/Runtime/GuiSys/CHudRadarInterface.hpp +++ b/Runtime/GuiSys/CHudRadarInterface.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CGuiCamera; class CGuiFrame; class CGuiWidget; @@ -45,4 +45,4 @@ public: void Draw(const CStateManager& mgr, float alpha); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudThreatInterface.cpp b/Runtime/GuiSys/CHudThreatInterface.cpp index 285707df0..25b6fcdae 100644 --- a/Runtime/GuiSys/CHudThreatInterface.cpp +++ b/Runtime/GuiSys/CHudThreatInterface.cpp @@ -10,7 +10,7 @@ #include "Runtime/GuiSys/CStringTable.hpp" #include "Runtime/Audio/CSfxManager.hpp" -namespace urde { +namespace metaforce { constexpr std::array CoordFuncs{ CHudThreatInterface::CombatThreatBarCoordFunc, nullptr, CHudThreatInterface::XRayThreatBarCoordFunc, @@ -234,4 +234,4 @@ std::pair CHudThreatInterface::ThermalThreatBa return {zeus::CVector3f(0.1f, 0.f, b), zeus::CVector3f(0.5f * c + 0.1f, 0.f, b)}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudThreatInterface.hpp b/Runtime/GuiSys/CHudThreatInterface.hpp index abb12af6d..95433056e 100644 --- a/Runtime/GuiSys/CHudThreatInterface.hpp +++ b/Runtime/GuiSys/CHudThreatInterface.hpp @@ -4,7 +4,7 @@ #include "Runtime/GuiSys/CHudInterface.hpp" #include -namespace urde { +namespace metaforce { class CAuiEnergyBarT01; class CGuiFrame; class CGuiModel; @@ -47,4 +47,4 @@ public: static std::pair ThermalThreatBarCoordFunc(float t); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudVisorBeamMenu.cpp b/Runtime/GuiSys/CHudVisorBeamMenu.cpp index 2cc4a9388..b0e882ae1 100644 --- a/Runtime/GuiSys/CHudVisorBeamMenu.cpp +++ b/Runtime/GuiSys/CHudVisorBeamMenu.cpp @@ -10,7 +10,7 @@ #include "Runtime/GuiSys/CGuiTextPane.hpp" #include "Runtime/GuiSys/CStringTable.hpp" -namespace urde { +namespace metaforce { constexpr std::array BaseMenuNames{ "BaseWidget_VisorMenu"sv, @@ -317,4 +317,4 @@ void CHudVisorBeamMenu::SetSelection(int selection, int pending, float interp) { x10_interp = interp; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CHudVisorBeamMenu.hpp b/Runtime/GuiSys/CHudVisorBeamMenu.hpp index d24820060..8e4f5611d 100644 --- a/Runtime/GuiSys/CHudVisorBeamMenu.hpp +++ b/Runtime/GuiSys/CHudVisorBeamMenu.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/rstl.hpp" -namespace urde { +namespace metaforce { class CGuiFrame; class CGuiModel; class CGuiTextPane; @@ -56,4 +56,4 @@ public: void SetSelection(int selection, int pending, float interp); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CInstruction.cpp b/Runtime/GuiSys/CInstruction.cpp index 963bf0bfd..cdc5578c3 100644 --- a/Runtime/GuiSys/CInstruction.cpp +++ b/Runtime/GuiSys/CInstruction.cpp @@ -5,7 +5,7 @@ #include "Runtime/GuiSys/CRasterFont.hpp" #include "Runtime/GuiSys/CTextRenderBuffer.hpp" -namespace urde { +namespace metaforce { void CInstruction::PageInvoke(CFontRenderState& state, CTextRenderBuffer* buf) const {} @@ -307,4 +307,4 @@ void CWordInstruction::PageInvoke(CFontRenderState& state, CTextRenderBuffer* bu state.x108_lineInitialized = false; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CInstruction.hpp b/Runtime/GuiSys/CInstruction.hpp index 79eb5c2f0..175e8c994 100644 --- a/Runtime/GuiSys/CInstruction.hpp +++ b/Runtime/GuiSys/CInstruction.hpp @@ -6,7 +6,7 @@ #include "Runtime/GuiSys/CFontImageDef.hpp" #include "Runtime/GuiSys/CGuiTextSupport.hpp" -namespace urde { +namespace metaforce { class CFontImageDef; class CFontRenderState; class CTextRenderBuffer; @@ -194,4 +194,4 @@ public: void PageInvoke(CFontRenderState& state, CTextRenderBuffer* buf) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/COrbitPointMarker.cpp b/Runtime/GuiSys/COrbitPointMarker.cpp index db5cfb2a8..a63cc9a24 100644 --- a/Runtime/GuiSys/COrbitPointMarker.cpp +++ b/Runtime/GuiSys/COrbitPointMarker.cpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { COrbitPointMarker::COrbitPointMarker() { x0_zOffset = g_tweakTargeting->GetOrbitPointZOffset(); @@ -95,4 +95,4 @@ void COrbitPointMarker::Draw(const CStateManager& mgr) const { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/COrbitPointMarker.hpp b/Runtime/GuiSys/COrbitPointMarker.hpp index b910babfe..593e432e2 100644 --- a/Runtime/GuiSys/COrbitPointMarker.hpp +++ b/Runtime/GuiSys/COrbitPointMarker.hpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { class CStateManager; class COrbitPointMarker { float x0_zOffset; @@ -26,4 +26,4 @@ public: void Update(float dt, const CStateManager& mgr); void Draw(const CStateManager& mgr) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CRasterFont.cpp b/Runtime/GuiSys/CRasterFont.cpp index f3fb99c78..53e1d46b4 100644 --- a/Runtime/GuiSys/CRasterFont.cpp +++ b/Runtime/GuiSys/CRasterFont.cpp @@ -7,8 +7,8 @@ #include "Runtime/GuiSys/CDrawStringOptions.hpp" #include "Runtime/GuiSys/CTextRenderBuffer.hpp" -namespace urde { -CRasterFont::CRasterFont(urde::CInputStream& in, urde::IObjectStore& store) { +namespace metaforce { +CRasterFont::CRasterFont(metaforce::CInputStream& in, metaforce::IObjectStore& store) { u32 magic = 0; in.readBytesToBuf(&magic, 4); if (magic != SBIG('FONT')) @@ -216,4 +216,4 @@ std::unique_ptr FRasterFontFactory([[maybe_unused]] const SObjectTag& tag, return TToken::GetIObjObjectFor(std::make_unique(in, *sp)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CRasterFont.hpp b/Runtime/GuiSys/CRasterFont.hpp index 3cb10eb5f..7ddd37f8c 100644 --- a/Runtime/GuiSys/CRasterFont.hpp +++ b/Runtime/GuiSys/CRasterFont.hpp @@ -11,7 +11,7 @@ #include -namespace urde { +namespace metaforce { class CDrawStringOptions; class CTextRenderBuffer; class IObjectStore; @@ -157,4 +157,4 @@ public: std::unique_ptr FRasterFontFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CSaveableState.cpp b/Runtime/GuiSys/CSaveableState.cpp index fccaa9199..2b73ff43d 100644 --- a/Runtime/GuiSys/CSaveableState.cpp +++ b/Runtime/GuiSys/CSaveableState.cpp @@ -2,7 +2,7 @@ #include "Runtime/GuiSys/CRasterFont.hpp" -namespace urde { +namespace metaforce { bool CSaveableState::IsFinishedLoading() const { if (!x48_font || !x48_font.IsLoaded()) @@ -10,4 +10,4 @@ bool CSaveableState::IsFinishedLoading() const { return x48_font->IsFinishedLoading(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CSaveableState.hpp b/Runtime/GuiSys/CSaveableState.hpp index 7b875f000..2809a2347 100644 --- a/Runtime/GuiSys/CSaveableState.hpp +++ b/Runtime/GuiSys/CSaveableState.hpp @@ -10,7 +10,7 @@ #include -namespace urde { +namespace metaforce { class CSaveableState { friend class CColorOverrideInstruction; friend class CFontInstruction; @@ -39,4 +39,4 @@ public: bool IsFinishedLoading() const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CScanDisplay.cpp b/Runtime/GuiSys/CScanDisplay.cpp index 2ed7305f5..2be7f62c0 100644 --- a/Runtime/GuiSys/CScanDisplay.cpp +++ b/Runtime/GuiSys/CScanDisplay.cpp @@ -16,7 +16,7 @@ #include -namespace urde { +namespace metaforce { void CScanDisplay::CDataDot::Update(float dt) { if (x20_remTime > 0.f) { x20_remTime = std::max(0.f, x20_remTime - dt); @@ -454,4 +454,4 @@ void CScanDisplay::Draw() { dot.Draw(g_tweakGuiColors->GetScanDataDotColor(), g_tweakGui->GetScanDataDotRadius() * vpRatio); } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CScanDisplay.hpp b/Runtime/GuiSys/CScanDisplay.hpp index 45b205bcf..8d116e081 100644 --- a/Runtime/GuiSys/CScanDisplay.hpp +++ b/Runtime/GuiSys/CScanDisplay.hpp @@ -14,7 +14,7 @@ #include #include -namespace urde { +namespace metaforce { class CAuiImagePane; class CGuiFrame; class CGuiModel; @@ -95,4 +95,4 @@ public: TUniqueId ScanTarget() const { return x10_objId; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CSplashScreen.cpp b/Runtime/GuiSys/CSplashScreen.cpp index f4fd01a50..a1c93f089 100644 --- a/Runtime/GuiSys/CSplashScreen.cpp +++ b/Runtime/GuiSys/CSplashScreen.cpp @@ -8,7 +8,7 @@ #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/Camera/CCameraFilter.hpp" -namespace urde { +namespace metaforce { constexpr std::array SplashTextures{"TXTR_NintendoLogo"sv, "TXTR_RetroLogo"sv, "TXTR_DolbyLogo"sv}; @@ -76,4 +76,4 @@ void CSplashScreen::Draw() { m_quad.draw(color, 1.f, rect); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CSplashScreen.hpp b/Runtime/GuiSys/CSplashScreen.hpp index 4737ea26b..f1feaabcd 100644 --- a/Runtime/GuiSys/CSplashScreen.hpp +++ b/Runtime/GuiSys/CSplashScreen.hpp @@ -5,7 +5,7 @@ #include "Runtime/Graphics/CTexture.hpp" #include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp" -namespace urde { +namespace metaforce { class CSplashScreen : public CIOWin { public: @@ -27,4 +27,4 @@ public: void Draw() override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CStringTable.cpp b/Runtime/GuiSys/CStringTable.cpp index 13d91889d..2874e052c 100644 --- a/Runtime/GuiSys/CStringTable.cpp +++ b/Runtime/GuiSys/CStringTable.cpp @@ -4,7 +4,7 @@ #include "Runtime/CToken.hpp" -namespace urde { +namespace metaforce { namespace { constexpr std::array languages{ FOURCC('ENGL'), FOURCC('FREN'), FOURCC('GERM'), FOURCC('SPAN'), FOURCC('ITAL'), FOURCC('DUTC'), FOURCC('JAPN'), @@ -77,4 +77,4 @@ CFactoryFnReturn FStringTableFactory(const SObjectTag&, CInputStream& in, const return TToken::GetIObjObjectFor(std::make_unique(in)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CStringTable.hpp b/Runtime/GuiSys/CStringTable.hpp index 88d574b78..d122958d3 100644 --- a/Runtime/GuiSys/CStringTable.hpp +++ b/Runtime/GuiSys/CStringTable.hpp @@ -5,7 +5,7 @@ #include "Runtime/IFactory.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CStringTable { static FourCC mCurrentLanguage; u32 x0_stringCount = 0; @@ -23,4 +23,4 @@ public: CFactoryFnReturn FStringTableFactory(const SObjectTag&, CInputStream&, const CVParamTransfer&, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CTargetingManager.cpp b/Runtime/GuiSys/CTargetingManager.cpp index c22052cfb..d2b536e57 100644 --- a/Runtime/GuiSys/CTargetingManager.cpp +++ b/Runtime/GuiSys/CTargetingManager.cpp @@ -5,7 +5,7 @@ #include "Runtime/Camera/CGameCamera.hpp" #include "Runtime/Graphics/CBooRenderer.hpp" -namespace urde { +namespace metaforce { CTargetingManager::CTargetingManager(const CStateManager& mgr) : x0_targetReticule(mgr) {} @@ -36,4 +36,4 @@ void CTargetingManager::Draw(const CStateManager& mgr, bool hideLockon) { void CTargetingManager::Touch() { x0_targetReticule.Touch(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CTargetingManager.hpp b/Runtime/GuiSys/CTargetingManager.hpp index 4a48380bd..18ea7f889 100644 --- a/Runtime/GuiSys/CTargetingManager.hpp +++ b/Runtime/GuiSys/CTargetingManager.hpp @@ -3,7 +3,7 @@ #include "Runtime/GuiSys/CCompoundTargetReticle.hpp" #include "Runtime/GuiSys/COrbitPointMarker.hpp" -namespace urde { +namespace metaforce { class CStateManager; class CTargetingManager { CCompoundTargetReticle x0_targetReticule; @@ -17,4 +17,4 @@ public: void Touch(); CCompoundTargetReticle& CompoundTargetReticle() { return x0_targetReticule; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CTextExecuteBuffer.cpp b/Runtime/GuiSys/CTextExecuteBuffer.cpp index 89c44e898..6cac32e35 100644 --- a/Runtime/GuiSys/CTextExecuteBuffer.cpp +++ b/Runtime/GuiSys/CTextExecuteBuffer.cpp @@ -9,7 +9,7 @@ #include "Runtime/GuiSys/CTextRenderBuffer.hpp" #include "Runtime/GuiSys/CWordBreakTables.hpp" -namespace urde { +namespace metaforce { CTextRenderBuffer CTextExecuteBuffer::BuildRenderBuffer(CGuiWidget::EGuiModelDrawFlags df) const { CTextRenderBuffer ret(CTextRenderBuffer::EMode::AllocTally, df); @@ -404,4 +404,4 @@ void CTextExecuteBuffer::Clear() { xbc_spaceDistance = 0; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CTextExecuteBuffer.hpp b/Runtime/GuiSys/CTextExecuteBuffer.hpp index e7dd10e75..c27c2e66e 100644 --- a/Runtime/GuiSys/CTextExecuteBuffer.hpp +++ b/Runtime/GuiSys/CTextExecuteBuffer.hpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { class CBlockInstruction; class CFontImageDef; class CInstruction; @@ -70,4 +70,4 @@ public: void Clear(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CTextParser.cpp b/Runtime/GuiSys/CTextParser.cpp index 154e7d5f3..cfe8527e0 100644 --- a/Runtime/GuiSys/CTextParser.cpp +++ b/Runtime/GuiSys/CTextParser.cpp @@ -3,7 +3,7 @@ #include "Runtime/GuiSys/CFontImageDef.hpp" #include "Runtime/GuiSys/CTextExecuteBuffer.hpp" -namespace urde { +namespace metaforce { static float u16stof(const char16_t* str) { char cstr[16]; @@ -298,4 +298,4 @@ void CTextParser::ParseText(CTextExecuteBuffer& out, const char16_t* str, int le out.AddString(str + b, e - b); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CTextParser.hpp b/Runtime/GuiSys/CTextParser.hpp index 39d574b70..b878bad85 100644 --- a/Runtime/GuiSys/CTextParser.hpp +++ b/Runtime/GuiSys/CTextParser.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/GuiSys/CGuiTextSupport.hpp" -namespace urde { +namespace metaforce { class CFontImageDef; class CTextExecuteBuffer; @@ -32,4 +32,4 @@ public: const std::vector>* txtrMap); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CTextRenderBuffer.cpp b/Runtime/GuiSys/CTextRenderBuffer.cpp index c389ca7fa..385cf38d5 100644 --- a/Runtime/GuiSys/CTextRenderBuffer.cpp +++ b/Runtime/GuiSys/CTextRenderBuffer.cpp @@ -10,7 +10,7 @@ #include "Runtime/GuiSys/CRasterFont.hpp" #include "Runtime/GuiSys/CTextExecuteBuffer.hpp" -namespace urde { +namespace metaforce { struct CTextRenderBuffer::BooFontCharacters { TLockedToken m_font; @@ -282,4 +282,4 @@ std::pair CTextRenderBuffer::AccumulateTextBou return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CTextRenderBuffer.hpp b/Runtime/GuiSys/CTextRenderBuffer.hpp index 12d1caa71..c5cbdd43f 100644 --- a/Runtime/GuiSys/CTextRenderBuffer.hpp +++ b/Runtime/GuiSys/CTextRenderBuffer.hpp @@ -19,7 +19,7 @@ #include #include -namespace urde { +namespace metaforce { class CGlyph; class CGraphicsPalette; class CRasterFont; @@ -115,4 +115,4 @@ public: std::pair AccumulateTextBounds() const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CWordBreakTables.cpp b/Runtime/GuiSys/CWordBreakTables.cpp index f132bb4e5..69a94610a 100644 --- a/Runtime/GuiSys/CWordBreakTables.cpp +++ b/Runtime/GuiSys/CWordBreakTables.cpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/rstl.hpp" -namespace urde { +namespace metaforce { namespace { struct CCharacterIdentifier { wchar_t chr; @@ -54,4 +54,4 @@ int CWordBreakTables::GetEndRank(wchar_t ch) { return search->rank; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/GuiSys/CWordBreakTables.hpp b/Runtime/GuiSys/CWordBreakTables.hpp index 119b91cf7..274f58911 100644 --- a/Runtime/GuiSys/CWordBreakTables.hpp +++ b/Runtime/GuiSys/CWordBreakTables.hpp @@ -1,6 +1,6 @@ #pragma once -namespace urde { +namespace metaforce { class CWordBreakTables { public: @@ -8,4 +8,4 @@ public: static int GetEndRank(wchar_t ch); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/IFactory.hpp b/Runtime/IFactory.hpp index b145b1b70..72d1f86b3 100644 --- a/Runtime/IFactory.hpp +++ b/Runtime/IFactory.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CFactoryMgr; class CObjectReference; class CResLoader; @@ -16,10 +16,10 @@ class IDvdRequest; class IObj; using CFactoryFnReturn = std::unique_ptr; -using FFactoryFunc = std::function; -using FMemFactoryFunc = std::function&& in, u32 len, - const urde::CVParamTransfer& vparms, CObjectReference* selfRef)>; +using FFactoryFunc = std::function; +using FMemFactoryFunc = std::function&& in, u32 len, + const metaforce::CVParamTransfer& vparms, CObjectReference* selfRef)>; class IFactory { public: @@ -38,13 +38,13 @@ public: virtual void AsyncIdle() {} /* Non-factory versions, replaces CResLoader */ - virtual u32 ResourceSize(const urde::SObjectTag& tag) = 0; - virtual std::shared_ptr LoadResourceAsync(const urde::SObjectTag& tag, void* target) = 0; - virtual std::shared_ptr LoadResourcePartAsync(const urde::SObjectTag& tag, u32 off, u32 size, + virtual u32 ResourceSize(const metaforce::SObjectTag& tag) = 0; + virtual std::shared_ptr LoadResourceAsync(const metaforce::SObjectTag& tag, void* target) = 0; + virtual std::shared_ptr LoadResourcePartAsync(const metaforce::SObjectTag& tag, u32 off, u32 size, void* target) = 0; - virtual std::unique_ptr LoadResourceSync(const urde::SObjectTag& tag) = 0; - virtual std::unique_ptr LoadNewResourcePartSync(const urde::SObjectTag& tag, u32 off, u32 size) = 0; + virtual std::unique_ptr LoadResourceSync(const metaforce::SObjectTag& tag) = 0; + virtual std::unique_ptr LoadNewResourcePartSync(const metaforce::SObjectTag& tag, u32 off, u32 size) = 0; virtual void GetTagListForFile(const char* pakName, std::vector& out) const {} }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/IMain.hpp b/Runtime/IMain.hpp index 16772b39f..416435c48 100644 --- a/Runtime/IMain.hpp +++ b/Runtime/IMain.hpp @@ -6,14 +6,14 @@ #include #include #include -#include "DataSpec/DNACommon/URDEVersionInfo.hpp" +#include "DataSpec/DNACommon/MetaforceVersionInfo.hpp" namespace hecl { class Console; class CVarManager; } // namespace hecl -namespace urde { +namespace metaforce { using ERegion = DataSpec::ERegion; using EGame = DataSpec::EGame; @@ -52,4 +52,4 @@ public: virtual bool IsTrilogy() const = 0; virtual std::string_view GetVersionString() const=0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/IOStreams.cpp b/Runtime/IOStreams.cpp index 2b76b7e67..da890cd47 100644 --- a/Runtime/IOStreams.cpp +++ b/Runtime/IOStreams.cpp @@ -1,7 +1,7 @@ #include "Runtime/IOStreams.hpp" #include -namespace urde { +namespace metaforce { #define DUMP_BITS 0 @@ -137,4 +137,4 @@ atUint64 CZipInputStream::readUBytesToBuf(void* buf, atUint64 len) { return x30_zstrm.total_out; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/IOStreams.hpp b/Runtime/IOStreams.hpp index 1fe75f4bd..6aef9d55c 100644 --- a/Runtime/IOStreams.hpp +++ b/Runtime/IOStreams.hpp @@ -12,7 +12,7 @@ #include #endif -namespace urde { +namespace metaforce { using CInputStream = athena::io::IStreamReader; using COutputStream = athena::io::IStreamWriter; @@ -71,4 +71,4 @@ public: }; #endif -} // namespace urde +} // namespace metaforce diff --git a/Runtime/IObj.hpp b/Runtime/IObj.hpp index 2c45ed233..f6df9645d 100644 --- a/Runtime/IObj.hpp +++ b/Runtime/IObj.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class IObj { public: @@ -30,4 +30,4 @@ public: T* GetObj() { return static_cast(m_objPtr); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/IObjFactory.hpp b/Runtime/IObjFactory.hpp index c67f3a65b..67f68efd8 100644 --- a/Runtime/IObjFactory.hpp +++ b/Runtime/IObjFactory.hpp @@ -1,10 +1,10 @@ #pragma once -namespace urde { +namespace metaforce { class IObjFactory { public: virtual ~IObjFactory() = default; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/IObjectStore.hpp b/Runtime/IObjectStore.hpp index db76a6893..a3506b4bf 100644 --- a/Runtime/IObjectStore.hpp +++ b/Runtime/IObjectStore.hpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { class CToken; class CVParamTransfer; class IFactory; @@ -22,4 +22,4 @@ public: virtual void ObjectUnreferenced(const SObjectTag&) = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/IRuntimeMain.hpp b/Runtime/IRuntimeMain.hpp index 0a24715bf..b8c02512b 100644 --- a/Runtime/IRuntimeMain.hpp +++ b/Runtime/IRuntimeMain.hpp @@ -1,9 +1,9 @@ #pragma once -namespace urde { +namespace metaforce { struct IRuntimeMain { void init() = 0; int proc() = 0; void stop() = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/ITweak.hpp b/Runtime/ITweak.hpp index 05aff8296..160d9a046 100644 --- a/Runtime/ITweak.hpp +++ b/Runtime/ITweak.hpp @@ -1,8 +1,8 @@ #pragma once -namespace urde { +namespace metaforce { class ITweak { public: virtual ~ITweak() = default; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/IVParamObj.hpp b/Runtime/IVParamObj.hpp index 83d307883..642ef20e9 100644 --- a/Runtime/IVParamObj.hpp +++ b/Runtime/IVParamObj.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/IObj.hpp" -namespace urde { +namespace metaforce { class IVParamObj : public IObj { public: @@ -44,4 +44,4 @@ public: static CVParamTransfer Null() noexcept { return CVParamTransfer(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/CFinalInput.cpp b/Runtime/Input/CFinalInput.cpp index e24e55e0a..944e240d8 100644 --- a/Runtime/Input/CFinalInput.cpp +++ b/Runtime/Input/CFinalInput.cpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { CFinalInput::CFinalInput() = default; @@ -162,4 +162,4 @@ CFinalInput CFinalInput::ScaleAnalogueSticks(float leftDiv, float rightDiv) cons ret.m_rightMul = 1.f / rightDiv; return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/CFinalInput.hpp b/Runtime/Input/CFinalInput.hpp index 478bd19a8..43e20d852 100644 --- a/Runtime/Input/CFinalInput.hpp +++ b/Runtime/Input/CFinalInput.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { struct CFinalInput { float x0_dt = 0.0f; @@ -173,4 +173,4 @@ struct CFinalInput { const std::optional& GetKBM() const { return m_kbm; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/CInputGenerator.cpp b/Runtime/Input/CInputGenerator.cpp index 52cab0777..495e2b774 100644 --- a/Runtime/Input/CInputGenerator.cpp +++ b/Runtime/Input/CInputGenerator.cpp @@ -3,7 +3,7 @@ #include "Runtime/CArchitectureMessage.hpp" #include "Runtime/CArchitectureQueue.hpp" -namespace urde { +namespace metaforce { void CInputGenerator::Update(float dt, CArchitectureQueue& queue) { if (m_firstFrame) { @@ -37,4 +37,4 @@ void CInputGenerator::Update(float dt, CArchitectureQueue& queue) { queue.Push(MakeMsg::CreateUserInput(EArchMsgTarget::Game, kbInput)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/CInputGenerator.hpp b/Runtime/Input/CInputGenerator.hpp index 6efd1fe48..c8445c5f9 100644 --- a/Runtime/Input/CInputGenerator.hpp +++ b/Runtime/Input/CInputGenerator.hpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { class CArchitectureQueue; enum class EIOPort { Zero, One, Two, Three }; @@ -182,4 +182,4 @@ public: void Update(float dt, CArchitectureQueue& queue); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/CKeyboardMouseController.hpp b/Runtime/Input/CKeyboardMouseController.hpp index 64d7710d9..67e053694 100644 --- a/Runtime/Input/CKeyboardMouseController.hpp +++ b/Runtime/Input/CKeyboardMouseController.hpp @@ -3,7 +3,7 @@ #include #include -namespace urde { +namespace metaforce { struct CKeyboardMouseControllerData { std::array m_charKeys{}; @@ -14,4 +14,4 @@ struct CKeyboardMouseControllerData { boo::SScrollDelta m_accumScroll; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/CRumbleGenerator.cpp b/Runtime/Input/CRumbleGenerator.cpp index b4b68ecfa..d778010c1 100644 --- a/Runtime/Input/CRumbleGenerator.cpp +++ b/Runtime/Input/CRumbleGenerator.cpp @@ -2,7 +2,7 @@ #include "Runtime/GameGlobalObjects.hpp" -namespace urde { +namespace metaforce { CRumbleGenerator::CRumbleGenerator() { HardStopAll(); @@ -109,4 +109,4 @@ void CRumbleGenerator::Stop(s16 id, EIOPort port) { vox.Deactivate(id, false); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/CRumbleGenerator.hpp b/Runtime/Input/CRumbleGenerator.hpp index 9ffaf3798..46bca6c57 100644 --- a/Runtime/Input/CRumbleGenerator.hpp +++ b/Runtime/Input/CRumbleGenerator.hpp @@ -6,7 +6,7 @@ #include "Runtime/Input/CInputGenerator.hpp" #include "Runtime/Input/CRumbleVoice.hpp" -namespace urde { +namespace metaforce { class CRumbleGenerator { std::array x0_voices; std::array xc0_periodTime; @@ -24,4 +24,4 @@ public: bool IsDisabled() const { return xf0_24_disabled; } void SetDisabled(bool disabled) { xf0_24_disabled = disabled; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/CRumbleManager.cpp b/Runtime/Input/CRumbleManager.cpp index 32fa03bd9..c00db013f 100644 --- a/Runtime/Input/CRumbleManager.cpp +++ b/Runtime/Input/CRumbleManager.cpp @@ -6,7 +6,7 @@ #include "Runtime/Input/RumbleFxTable.hpp" #include "Runtime/World/CPlayer.hpp" -namespace urde { +namespace metaforce { s16 CRumbleManager::Rumble(CStateManager& mgr, const zeus::CVector3f& pos, ERumbleFxId fx, float dist, ERumblePriority priority) { @@ -24,4 +24,4 @@ s16 CRumbleManager::Rumble(CStateManager& mgr, ERumbleFxId fx, float gain, ERumb return -1; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/CRumbleManager.hpp b/Runtime/Input/CRumbleManager.hpp index c820dacec..9d642196c 100644 --- a/Runtime/Input/CRumbleManager.hpp +++ b/Runtime/Input/CRumbleManager.hpp @@ -5,7 +5,7 @@ #include -namespace urde { +namespace metaforce { class CStateManager; class CRumbleManager { CRumbleGenerator x0_rumbleGenerator; @@ -23,4 +23,4 @@ public: s16 Rumble(CStateManager& mgr, const zeus::CVector3f& pos, ERumbleFxId fx, float dist, ERumblePriority priority); s16 Rumble(CStateManager& mgr, ERumbleFxId fx, float gain, ERumblePriority priority); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/CRumbleVoice.cpp b/Runtime/Input/CRumbleVoice.cpp index 4c21805a1..8981f14be 100644 --- a/Runtime/Input/CRumbleVoice.cpp +++ b/Runtime/Input/CRumbleVoice.cpp @@ -1,6 +1,6 @@ #include "Runtime/Input/CRumbleVoice.hpp" -namespace urde { +namespace metaforce { CRumbleVoice::CRumbleVoice() : x0_datas(4), x10_deltas(4, SAdsrDelta::Stopped()) { x20_handleIds.resize(4); @@ -156,4 +156,4 @@ void CRumbleVoice::Deactivate(s16 id, bool b1) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/CRumbleVoice.hpp b/Runtime/Input/CRumbleVoice.hpp index 842250037..7dcb09cd0 100644 --- a/Runtime/Input/CRumbleVoice.hpp +++ b/Runtime/Input/CRumbleVoice.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/rstl.hpp" -namespace urde { +namespace metaforce { enum class ERumbleFxId { Zero = 0, One = 1, @@ -91,4 +91,4 @@ public: void Deactivate(s16 id, bool b1); ERumblePriority GetPriority(s16 idx) const { return x10_deltas[idx].x1c_priority; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/ControlMapper.cpp b/Runtime/Input/ControlMapper.cpp index b42491725..e380daef6 100644 --- a/Runtime/Input/ControlMapper.cpp +++ b/Runtime/Input/ControlMapper.cpp @@ -8,7 +8,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Input/CFinalInput.hpp" -namespace urde { +namespace metaforce { namespace { constexpr std::array skCommandDescs{ "Forward", "Backward", "Turn Left", @@ -416,4 +416,4 @@ const char* ControlMapper::GetDescriptionForFunction(EFunctionList func) { return skFunctionDescs[size_t(func)]; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/ControlMapper.hpp b/Runtime/Input/ControlMapper.hpp index 81a139bd8..952fcdeaf 100644 --- a/Runtime/Input/ControlMapper.hpp +++ b/Runtime/Input/ControlMapper.hpp @@ -4,7 +4,7 @@ #include -namespace urde { +namespace metaforce { struct CFinalInput; class ControlMapper { @@ -136,4 +136,4 @@ constexpr ControlMapper::EKBMFunctionList operator+(ControlMapper::EKBMFunctionL return ControlMapper::EKBMFunctionList(static_cast(a) + static_cast(b)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/IController.hpp b/Runtime/Input/IController.hpp index efae5ecd0..d6069d40a 100644 --- a/Runtime/Input/IController.hpp +++ b/Runtime/Input/IController.hpp @@ -1,6 +1,6 @@ #pragma once -namespace urde { +namespace metaforce { class IController { public: @@ -9,4 +9,4 @@ public: virtual void SetMotorState(EMotorState state) = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Input/RumbleFxTable.cpp b/Runtime/Input/RumbleFxTable.cpp index f35a6f6ee..8aad0dd74 100644 --- a/Runtime/Input/RumbleFxTable.cpp +++ b/Runtime/Input/RumbleFxTable.cpp @@ -1,6 +1,6 @@ #include "Runtime/Input/RumbleFxTable.hpp" -namespace urde { +namespace metaforce { constexpr RumbleFXTable RumbleFxTable{{ /* attackGain, autoReleaseDur, attackDur, decayDur, sustainGain, releaseDur, hasSustain, autoRelease */ diff --git a/Runtime/Input/RumbleFxTable.hpp b/Runtime/Input/RumbleFxTable.hpp index 9d649537c..030d90386 100644 --- a/Runtime/Input/RumbleFxTable.hpp +++ b/Runtime/Input/RumbleFxTable.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/Input/CRumbleVoice.hpp" -namespace urde { +namespace metaforce { using RumbleFXTable = std::array; diff --git a/Runtime/MP1/CArtifactDoll.cpp b/Runtime/MP1/CArtifactDoll.cpp index 7df5643b2..d9a38baf2 100644 --- a/Runtime/MP1/CArtifactDoll.cpp +++ b/Runtime/MP1/CArtifactDoll.cpp @@ -13,7 +13,7 @@ #include #include -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::array ArtifactPieceModels{ "CMDL_Piece1", // Truth @@ -177,4 +177,4 @@ bool CArtifactDoll::CheckLoadComplete() { return true; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CArtifactDoll.hpp b/Runtime/MP1/CArtifactDoll.hpp index 549c6e13f..eb79d671a 100644 --- a/Runtime/MP1/CArtifactDoll.hpp +++ b/Runtime/MP1/CArtifactDoll.hpp @@ -8,7 +8,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Character/CActorLights.hpp" -namespace urde { +namespace metaforce { class CModel; namespace MP1 { @@ -34,4 +34,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CAudioStateWin.cpp b/Runtime/MP1/CAudioStateWin.cpp index 89ca24fb1..fb18e3fd1 100644 --- a/Runtime/MP1/CAudioStateWin.cpp +++ b/Runtime/MP1/CAudioStateWin.cpp @@ -7,7 +7,7 @@ #include "Runtime/Audio/CSfxManager.hpp" #include "Runtime/MP1/MP1.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CIOWin::EMessageReturn CAudioStateWin::OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue) { CMain* m = static_cast(g_Main); @@ -26,4 +26,4 @@ CIOWin::EMessageReturn CAudioStateWin::OnMessage(const CArchitectureMessage& msg return EMessageReturn::Normal; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CAudioStateWin.hpp b/Runtime/MP1/CAudioStateWin.hpp index fb6dd7064..937a3f8d4 100644 --- a/Runtime/MP1/CAudioStateWin.hpp +++ b/Runtime/MP1/CAudioStateWin.hpp @@ -2,11 +2,11 @@ #include "Runtime/CIOWin.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CAudioStateWin : public CIOWin { public: CAudioStateWin() : CIOWin("CAudioStateWin") {} CIOWin::EMessageReturn OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CAutoSave.cpp b/Runtime/MP1/CAutoSave.cpp index ce69028be..cdd092e02 100644 --- a/Runtime/MP1/CAutoSave.cpp +++ b/Runtime/MP1/CAutoSave.cpp @@ -2,7 +2,7 @@ #include "CSaveGameScreen.hpp" #include "Runtime/MP1/MP1.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CAutoSave::CAutoSave() : CIOWin("AutoSave"sv), x14_savegameScreen(new CSaveGameScreen(ESaveContext::InGame, g_GameState->GetCardSerial())) { static_cast(g_Main)->RefreshGameState(); @@ -26,4 +26,4 @@ CIOWin::EMessageReturn CAutoSave::OnMessage(const CArchitectureMessage& msg, CAr return EMessageReturn::Exit; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CAutoSave.hpp b/Runtime/MP1/CAutoSave.hpp index 658b3f6f2..4ba3a7fcf 100644 --- a/Runtime/MP1/CAutoSave.hpp +++ b/Runtime/MP1/CAutoSave.hpp @@ -2,7 +2,7 @@ #include "Runtime/CIOWin.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CSaveGameScreen; class CAutoSave : CIOWin { std::unique_ptr x14_savegameScreen; @@ -14,4 +14,4 @@ public: bool GetIsContinueDraw() const override { return false; } EMessageReturn OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CCredits.cpp b/Runtime/MP1/CCredits.cpp index 1c229dbc7..9b896cea7 100644 --- a/Runtime/MP1/CCredits.cpp +++ b/Runtime/MP1/CCredits.cpp @@ -2,7 +2,7 @@ #include "Runtime/Graphics/CGraphics.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CCredits::CCredits() : CIOWin("Credits") {} @@ -14,4 +14,4 @@ void CCredits::Draw() { SCOPED_GRAPHICS_DEBUG_GROUP("CCredits::Draw", zeus::skGreen); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CCredits.hpp b/Runtime/MP1/CCredits.hpp index 6648a8a83..d5efabd56 100644 --- a/Runtime/MP1/CCredits.hpp +++ b/Runtime/MP1/CCredits.hpp @@ -2,7 +2,7 @@ #include "Runtime/CIOWin.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CCredits : public CIOWin { public: @@ -12,4 +12,4 @@ public: void Draw() override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CFaceplateDecoration.cpp b/Runtime/MP1/CFaceplateDecoration.cpp index 2c45c778a..f8e8d21e6 100644 --- a/Runtime/MP1/CFaceplateDecoration.cpp +++ b/Runtime/MP1/CFaceplateDecoration.cpp @@ -6,7 +6,7 @@ #include "Runtime/Particle/CGenDescription.hpp" #include "Runtime/World/CPlayer.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CFaceplateDecoration::CFaceplateDecoration(CStateManager& stateMgr) {} @@ -43,4 +43,4 @@ void CFaceplateDecoration::Draw(CStateManager& stateMgr) { } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CFaceplateDecoration.hpp b/Runtime/MP1/CFaceplateDecoration.hpp index 94891bfaa..92116d0d4 100644 --- a/Runtime/MP1/CFaceplateDecoration.hpp +++ b/Runtime/MP1/CFaceplateDecoration.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp" -namespace urde { +namespace metaforce { class CStateManager; namespace MP1 { @@ -24,4 +24,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CFrontEndUI.cpp b/Runtime/MP1/CFrontEndUI.cpp index 6525104a1..a103e7b66 100644 --- a/Runtime/MP1/CFrontEndUI.cpp +++ b/Runtime/MP1/CFrontEndUI.cpp @@ -29,7 +29,7 @@ #include "Runtime/MP1/CSlideShow.hpp" #include "Runtime/MP1/MP1.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { #define FE_USE_SECONDS_IN_ELAPSED 1 @@ -2534,4 +2534,4 @@ CIOWin::EMessageReturn CFrontEndUI::OnMessage(const CArchitectureMessage& msg, C return EMessageReturn::Normal; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CFrontEndUI.hpp b/Runtime/MP1/CFrontEndUI.hpp index e708390f1..92696f913 100644 --- a/Runtime/MP1/CFrontEndUI.hpp +++ b/Runtime/MP1/CFrontEndUI.hpp @@ -21,7 +21,7 @@ #include -namespace urde { +namespace metaforce { class CAudioGroupSet; class CDependencyGroup; class CGuiFrame; @@ -390,4 +390,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CFrontEndUITouchBar.cpp b/Runtime/MP1/CFrontEndUITouchBar.cpp index 6afb30f10..b37d5f96d 100644 --- a/Runtime/MP1/CFrontEndUITouchBar.cpp +++ b/Runtime/MP1/CFrontEndUITouchBar.cpp @@ -1,6 +1,6 @@ #include "Runtime/MP1/CFrontEndUITouchBar.hpp" -namespace urde { +namespace metaforce { CFrontEndUITouchBar::~CFrontEndUITouchBar() = default; void CFrontEndUITouchBar::SetPhase(EPhase ph) { m_phase = ph; } @@ -17,4 +17,4 @@ CFrontEndUITouchBar::EAction CFrontEndUITouchBar::PopAction() { return EAction:: std::unique_ptr NewFrontEndUITouchBar() { return std::make_unique(); } #endif -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CFrontEndUITouchBar.hpp b/Runtime/MP1/CFrontEndUITouchBar.hpp index 7d74abffa..58cb3df45 100644 --- a/Runtime/MP1/CFrontEndUITouchBar.hpp +++ b/Runtime/MP1/CFrontEndUITouchBar.hpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { class CFrontEndUITouchBar { public: @@ -46,4 +46,4 @@ public: std::unique_ptr NewFrontEndUITouchBar(); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CFrontEndUITouchBarMac.mm b/Runtime/MP1/CFrontEndUITouchBarMac.mm index 211eb95f6..e07efdf55 100644 --- a/Runtime/MP1/CFrontEndUITouchBarMac.mm +++ b/Runtime/MP1/CFrontEndUITouchBarMac.mm @@ -25,15 +25,15 @@ static NSColor* HardModeColor() return [NSColor redColor]; } -static NSColor* FileColor(const urde::CFrontEndUITouchBar::SFileSelectDetail& detail) +static NSColor* FileColor(const metaforce::CFrontEndUITouchBar::SFileSelectDetail& detail) { switch (detail.state) { - case urde::CFrontEndUITouchBar::EFileState::New: + case metaforce::CFrontEndUITouchBar::EFileState::New: return [NSColor darkGrayColor]; - case urde::CFrontEndUITouchBar::EFileState::Normal: + case metaforce::CFrontEndUITouchBar::EFileState::Normal: return NormalModeColor(); - case urde::CFrontEndUITouchBar::EFileState::Hard: + case metaforce::CFrontEndUITouchBar::EFileState::Hard: return HardModeColor(); } } @@ -92,7 +92,7 @@ static NSColor* FileColor(const urde::CFrontEndUITouchBar::SFileSelectDetail& de @interface FrontEndUITouchBarProceedBack : NSObject { @public - urde::CFrontEndUITouchBar::EAction _action; + metaforce::CFrontEndUITouchBar::EAction _action; } -(IBAction)onBack:(id)sender; -(IBAction)onProceed:(id)sender; @@ -143,18 +143,18 @@ static NSColor* FileColor(const urde::CFrontEndUITouchBar::SFileSelectDetail& de } -(IBAction)onBack:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Back; + _action = metaforce::CFrontEndUITouchBar::EAction::Back; } -(IBAction)onProceed:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Confirm; + _action = metaforce::CFrontEndUITouchBar::EAction::Confirm; } @end @interface FrontEndUITouchBarStartOptions : NSObject { @public - urde::CFrontEndUITouchBar::EAction _action; + metaforce::CFrontEndUITouchBar::EAction _action; BOOL _normalBeat; } -(IBAction)onStart:(id)sender; @@ -233,30 +233,30 @@ static NSColor* FileColor(const urde::CFrontEndUITouchBar::SFileSelectDetail& de } -(IBAction)onStart:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Start; + _action = metaforce::CFrontEndUITouchBar::EAction::Start; } -(IBAction)onNormal:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Normal; + _action = metaforce::CFrontEndUITouchBar::EAction::Normal; } -(IBAction)onHard:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Hard; + _action = metaforce::CFrontEndUITouchBar::EAction::Hard; } -(IBAction)onOptions:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Options; + _action = metaforce::CFrontEndUITouchBar::EAction::Options; } -(IBAction)onCancel:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Back; + _action = metaforce::CFrontEndUITouchBar::EAction::Back; } @end @interface FrontEndUITouchBarEraseBack : NSObject { @public - urde::CFrontEndUITouchBar::EAction _action; + metaforce::CFrontEndUITouchBar::EAction _action; } -(IBAction)onCancel:(id)sender; -(IBAction)onErase:(id)sender; @@ -306,23 +306,23 @@ static NSColor* FileColor(const urde::CFrontEndUITouchBar::SFileSelectDetail& de } -(IBAction)onCancel:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Back; + _action = metaforce::CFrontEndUITouchBar::EAction::Back; } -(IBAction)onErase:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Confirm; + _action = metaforce::CFrontEndUITouchBar::EAction::Confirm; } @end -static NSString* GetFileSelectTitle(const urde::CFrontEndUITouchBar::SFileSelectDetail& detail, char letter) +static NSString* GetFileSelectTitle(const metaforce::CFrontEndUITouchBar::SFileSelectDetail& detail, char letter) { switch (detail.state) { - case urde::CFrontEndUITouchBar::EFileState::New: + case metaforce::CFrontEndUITouchBar::EFileState::New: return [NSString stringWithFormat:@"[New Game %c]", letter]; - case urde::CFrontEndUITouchBar::EFileState::Normal: + case metaforce::CFrontEndUITouchBar::EFileState::Normal: return [NSString stringWithFormat:@"[Samus %c] %d%%", letter, detail.percent]; - case urde::CFrontEndUITouchBar::EFileState::Hard: + case metaforce::CFrontEndUITouchBar::EFileState::Hard: return [NSString stringWithFormat:@"[Hard %c] %d%%", letter, detail.percent]; } return @""; @@ -331,8 +331,8 @@ static NSString* GetFileSelectTitle(const urde::CFrontEndUITouchBar::SFileSelect @interface FrontEndUITouchBarFileSelect : NSObject { @public - urde::CFrontEndUITouchBar::SFileSelectDetail _details[3]; - urde::CFrontEndUITouchBar::EAction _action; + metaforce::CFrontEndUITouchBar::SFileSelectDetail _details[3]; + metaforce::CFrontEndUITouchBar::EAction _action; BOOL _eraseGame; BOOL _galleryActive; } @@ -374,7 +374,7 @@ static NSString* GetFileSelectTitle(const urde::CFrontEndUITouchBar::SFileSelect NSCustomTouchBarItem* item = [[NSCustomTouchBarItem alloc] initWithIdentifier:identifier]; NSButton* button = [NSButton buttonWithTitle:GetFileSelectTitle(_details[0], 'A') target:self action:@selector(onFileA:)]; button.bezelColor = FileColor(_details[0]); - button.enabled = !_eraseGame || _details[0].state != urde::CFrontEndUITouchBar::EFileState::New; + button.enabled = !_eraseGame || _details[0].state != metaforce::CFrontEndUITouchBar::EFileState::New; item.view = button; return item; } @@ -383,7 +383,7 @@ static NSString* GetFileSelectTitle(const urde::CFrontEndUITouchBar::SFileSelect NSCustomTouchBarItem* item = [[NSCustomTouchBarItem alloc] initWithIdentifier:identifier]; NSButton* button = [NSButton buttonWithTitle:GetFileSelectTitle(_details[1], 'B') target:self action:@selector(onFileB:)]; button.bezelColor = FileColor(_details[1]); - button.enabled = !_eraseGame || _details[1].state != urde::CFrontEndUITouchBar::EFileState::New; + button.enabled = !_eraseGame || _details[1].state != metaforce::CFrontEndUITouchBar::EFileState::New; item.view = button; return item; } @@ -392,7 +392,7 @@ static NSString* GetFileSelectTitle(const urde::CFrontEndUITouchBar::SFileSelect NSCustomTouchBarItem* item = [[NSCustomTouchBarItem alloc] initWithIdentifier:identifier]; NSButton* button = [NSButton buttonWithTitle:GetFileSelectTitle(_details[2], 'C') target:self action:@selector(onFileC:)]; button.bezelColor = FileColor(_details[2]); - button.enabled = !_eraseGame || _details[2].state != urde::CFrontEndUITouchBar::EFileState::New; + button.enabled = !_eraseGame || _details[2].state != metaforce::CFrontEndUITouchBar::EFileState::New; item.view = button; return item; } @@ -405,7 +405,7 @@ static NSString* GetFileSelectTitle(const urde::CFrontEndUITouchBar::SFileSelect target:self action:@selector(onErase:)]; bool hasSave = false; for (int i=0 ; i<3 ; ++i) - if (_details[i].state != urde::CFrontEndUITouchBar::EFileState::New) + if (_details[i].state != metaforce::CFrontEndUITouchBar::EFileState::New) { hasSave = true; break; @@ -441,37 +441,37 @@ static NSString* GetFileSelectTitle(const urde::CFrontEndUITouchBar::SFileSelect } -(IBAction)onFileA:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::FileA; + _action = metaforce::CFrontEndUITouchBar::EAction::FileA; } -(IBAction)onFileB:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::FileB; + _action = metaforce::CFrontEndUITouchBar::EAction::FileB; } -(IBAction)onFileC:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::FileC; + _action = metaforce::CFrontEndUITouchBar::EAction::FileC; } -(IBAction)onErase:(id)sender { if (!_eraseGame) - _action = urde::CFrontEndUITouchBar::EAction::Erase; + _action = metaforce::CFrontEndUITouchBar::EAction::Erase; else - _action = urde::CFrontEndUITouchBar::EAction::Back; + _action = metaforce::CFrontEndUITouchBar::EAction::Back; } -(IBAction)onFusionBonus:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::FusionBonus; + _action = metaforce::CFrontEndUITouchBar::EAction::FusionBonus; } -(IBAction)onImageGallery:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::ImageGallery; + _action = metaforce::CFrontEndUITouchBar::EAction::ImageGallery; } @end @interface FrontEndUITouchBarNoCardSelect : NSObject { @public - urde::CFrontEndUITouchBar::EAction _action; + metaforce::CFrontEndUITouchBar::EAction _action; BOOL _galleryActive; } -(IBAction)onStart:(id)sender; @@ -539,26 +539,26 @@ static NSString* GetFileSelectTitle(const urde::CFrontEndUITouchBar::SFileSelect } -(IBAction)onStart:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Start; + _action = metaforce::CFrontEndUITouchBar::EAction::Start; } -(IBAction)onOptions:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Options; + _action = metaforce::CFrontEndUITouchBar::EAction::Options; } -(IBAction)onFusionBonus:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::FusionBonus; + _action = metaforce::CFrontEndUITouchBar::EAction::FusionBonus; } -(IBAction)onImageGallery:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::ImageGallery; + _action = metaforce::CFrontEndUITouchBar::EAction::ImageGallery; } @end @interface FrontEndUITouchBarFusionBonus : NSObject { @public - urde::CFrontEndUITouchBar::EAction _action; + metaforce::CFrontEndUITouchBar::EAction _action; BOOL _fusionSuitActive; } -(IBAction)onNESMetroid:(id)sender; @@ -619,19 +619,19 @@ static NSString* GetFileSelectTitle(const urde::CFrontEndUITouchBar::SFileSelect } -(IBAction)onNESMetroid:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::NESMetroid; + _action = metaforce::CFrontEndUITouchBar::EAction::NESMetroid; } -(IBAction)onFusionSuit:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::FusionSuit; + _action = metaforce::CFrontEndUITouchBar::EAction::FusionSuit; } -(IBAction)onBack:(id)sender { - _action = urde::CFrontEndUITouchBar::EAction::Back; + _action = metaforce::CFrontEndUITouchBar::EAction::Back; } @end -namespace urde +namespace metaforce { class CFrontEndUITouchBarMac : public CFrontEndUITouchBar diff --git a/Runtime/MP1/CGBASupport.cpp b/Runtime/MP1/CGBASupport.cpp index 1806edc56..044508788 100644 --- a/Runtime/MP1/CGBASupport.cpp +++ b/Runtime/MP1/CGBASupport.cpp @@ -8,7 +8,7 @@ #include #include -namespace urde::MP1 { +namespace metaforce::MP1 { static jbus::Listener g_JbusListener; static std::unique_ptr g_JbusEndpoint; @@ -218,4 +218,4 @@ void CGBASupport::StartLink() { x40_siChan = -1; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CGBASupport.hpp b/Runtime/MP1/CGBASupport.hpp index 301d2d0e6..08bcc3e6d 100644 --- a/Runtime/MP1/CGBASupport.hpp +++ b/Runtime/MP1/CGBASupport.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/CDvdFile.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CGBASupport : public CDvdFile { public: @@ -50,4 +50,4 @@ public: bool IsFusionBeat() const { return x45_fusionBeat; } }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CGameCubeDoll.cpp b/Runtime/MP1/CGameCubeDoll.cpp index 285ac0a82..e8ac9f944 100644 --- a/Runtime/MP1/CGameCubeDoll.cpp +++ b/Runtime/MP1/CGameCubeDoll.cpp @@ -4,7 +4,7 @@ #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/Graphics/CBooRenderer.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CGameCubeDoll::CGameCubeDoll() { x0_model = g_SimplePool->GetObj("CMDL_GameCube"); @@ -56,4 +56,4 @@ bool CGameCubeDoll::CheckLoadComplete() { return false; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CGameCubeDoll.hpp b/Runtime/MP1/CGameCubeDoll.hpp index 2d81041b4..3797cc609 100644 --- a/Runtime/MP1/CGameCubeDoll.hpp +++ b/Runtime/MP1/CGameCubeDoll.hpp @@ -7,7 +7,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Character/CActorLights.hpp" -namespace urde { +namespace metaforce { class CModel; namespace MP1 { @@ -29,4 +29,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CInGameGuiManager.cpp b/Runtime/MP1/CInGameGuiManager.cpp index 67c341650..da552322c 100644 --- a/Runtime/MP1/CInGameGuiManager.cpp +++ b/Runtime/MP1/CInGameGuiManager.cpp @@ -21,7 +21,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr std::array InGameGuiDGRPs{ "InGameGui_DGRP"sv, "Ice_DGRP"sv, "Phazon_DGRP"sv, "Plasma_DGRP"sv, @@ -641,4 +641,4 @@ bool CInGameGuiManager::GetIsGameDraw() const { // return x3c_pauseScreenBlur->IsGameDraw(); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CInGameGuiManager.hpp b/Runtime/MP1/CInGameGuiManager.hpp index 7c3e252c7..2173ee038 100644 --- a/Runtime/MP1/CInGameGuiManager.hpp +++ b/Runtime/MP1/CInGameGuiManager.hpp @@ -27,7 +27,7 @@ #include #include -namespace urde { +namespace metaforce { class CActorLights; class CArchitectureQueue; class CAutoMapper; @@ -138,4 +138,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CInGameGuiManagerCommon.hpp b/Runtime/MP1/CInGameGuiManagerCommon.hpp index 3e72a91ce..eb5e1eee8 100644 --- a/Runtime/MP1/CInGameGuiManagerCommon.hpp +++ b/Runtime/MP1/CInGameGuiManagerCommon.hpp @@ -1,6 +1,6 @@ #pragma once -namespace urde::MP1 { +namespace metaforce::MP1 { enum class EInGameGuiState { Zero, InGame, MapScreen, PauseGame, PauseLogBook, PauseSaveGame, PauseHUDMessage }; diff --git a/Runtime/MP1/CInGameTweakManager.hpp b/Runtime/MP1/CInGameTweakManager.hpp index 0be9131f8..4317c9e22 100644 --- a/Runtime/MP1/CInGameTweakManager.hpp +++ b/Runtime/MP1/CInGameTweakManager.hpp @@ -2,10 +2,10 @@ #include "Runtime/CInGameTweakManagerBase.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CInGameTweakManager : public CInGameTweakManagerBase { public: }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CInventoryScreen.cpp b/Runtime/MP1/CInventoryScreen.cpp index 47082ad3c..e43dbb5ca 100644 --- a/Runtime/MP1/CInventoryScreen.cpp +++ b/Runtime/MP1/CInventoryScreen.cpp @@ -9,7 +9,7 @@ #include "Runtime/Input/ControlMapper.hpp" #include "Runtime/IMain.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { struct SInventoryItem { u32 idx; @@ -566,4 +566,4 @@ void CInventoryScreen::UpdateSamusDollPulses() { x19c_samusDoll->SetPulseVisor(pulseVisor); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CInventoryScreen.hpp b/Runtime/MP1/CInventoryScreen.hpp index 51a7642de..bd4b4f65e 100644 --- a/Runtime/MP1/CInventoryScreen.hpp +++ b/Runtime/MP1/CInventoryScreen.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CDependencyGroup; namespace MP1 { @@ -60,4 +60,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CLogBookScreen.cpp b/Runtime/MP1/CLogBookScreen.cpp index 7d4a6f3e5..27759aa77 100644 --- a/Runtime/MP1/CLogBookScreen.cpp +++ b/Runtime/MP1/CLogBookScreen.cpp @@ -11,7 +11,7 @@ #include "Runtime/MP1/CArtifactDoll.hpp" #include "Runtime/MP1/MP1.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CLogBookScreen::CLogBookScreen(const CStateManager& mgr, CGuiFrame& frame, const CStringTable& pauseStrg) : CPauseScreenBase(mgr, frame, pauseStrg, true) { @@ -440,4 +440,4 @@ bool CLogBookScreen::ShouldRightTableAdvance() const { u32 CLogBookScreen::GetRightTableCount() const { return x1f0_curViewScans.size(); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CLogBookScreen.hpp b/Runtime/MP1/CLogBookScreen.hpp index 246678a63..4a100ed1a 100644 --- a/Runtime/MP1/CLogBookScreen.hpp +++ b/Runtime/MP1/CLogBookScreen.hpp @@ -9,13 +9,13 @@ #include "Runtime/rstl.hpp" #include "Runtime/MP1/CPauseScreenBase.hpp" -namespace urde { +namespace metaforce { class CPlayerState; class CScannableObjectInfo; class CStringTable; -} // namespace urde +} // namespace metaforce -namespace urde::MP1 { +namespace metaforce::MP1 { class CArtifactDoll; class CLogBookScreen : public CPauseScreenBase { @@ -65,4 +65,4 @@ public: u32 GetRightTableCount() const override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CMFGame.cpp b/Runtime/MP1/CMFGame.cpp index e6d974961..4f8751872 100644 --- a/Runtime/MP1/CMFGame.cpp +++ b/Runtime/MP1/CMFGame.cpp @@ -12,7 +12,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CMFGame::CMFGame(const std::weak_ptr& stateMgr, const std::weak_ptr& guiMgr, const CArchitectureQueue&) @@ -375,4 +375,4 @@ void CMFGameLoader::Draw() { g_GameState->GetWorldTransitionManager()->Draw(); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CMFGame.hpp b/Runtime/MP1/CMFGame.hpp index 3284006ee..ecf089a93 100644 --- a/Runtime/MP1/CMFGame.hpp +++ b/Runtime/MP1/CMFGame.hpp @@ -8,7 +8,7 @@ #include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp" #include "Runtime/MP1/CInGameGuiManager.hpp" -namespace urde { +namespace metaforce { class CStateManager; class CToken; @@ -65,4 +65,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CMainFlow.cpp b/Runtime/MP1/CMainFlow.cpp index 5cf040a5f..19643012a 100644 --- a/Runtime/MP1/CMainFlow.cpp +++ b/Runtime/MP1/CMainFlow.cpp @@ -16,7 +16,7 @@ #include "Runtime/MP1/CStateSetterFlow.hpp" #include "Runtime/MP1/MP1.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { void CMainFlow::AdvanceGameState(CArchitectureQueue& queue) { switch (x14_gameState) { @@ -100,4 +100,4 @@ void CMainFlow::SetGameState(EClientFlowStates state, CArchitectureQueue& queue) } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CMainFlow.hpp b/Runtime/MP1/CMainFlow.hpp index 04c0f0da1..ec805c725 100644 --- a/Runtime/MP1/CMainFlow.hpp +++ b/Runtime/MP1/CMainFlow.hpp @@ -2,7 +2,7 @@ #include "Runtime/CMainFlowBase.hpp" -namespace urde { +namespace metaforce { class CArchitectureMessage; class CArchitectureQueue; @@ -19,4 +19,4 @@ public: } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CMemoryCardDriver.cpp b/Runtime/MP1/CMemoryCardDriver.cpp index a8a1b2669..542ca9465 100644 --- a/Runtime/MP1/CMemoryCardDriver.cpp +++ b/Runtime/MP1/CMemoryCardDriver.cpp @@ -5,7 +5,7 @@ #include "Runtime/CCRC32.hpp" #include "Runtime/MP1/MP1.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr std::array SaveFileNames{"MetroidPrime A", "MetroidPrime B"}; @@ -796,4 +796,4 @@ void CMemoryCardDriver::Update() { static_cast(g_Main)->SetCardBusy(cardBusy); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CMemoryCardDriver.hpp b/Runtime/MP1/CMemoryCardDriver.hpp index 732e39181..fec06aa25 100644 --- a/Runtime/MP1/CMemoryCardDriver.hpp +++ b/Runtime/MP1/CMemoryCardDriver.hpp @@ -8,7 +8,7 @@ #include "Runtime/CGameState.hpp" #include "Runtime/CMemoryCardSys.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CMemoryCardDriver { friend class CSaveGameScreen; @@ -195,4 +195,4 @@ public: } }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CMessageScreen.cpp b/Runtime/MP1/CMessageScreen.cpp index aba57d97a..29264d32c 100644 --- a/Runtime/MP1/CMessageScreen.cpp +++ b/Runtime/MP1/CMessageScreen.cpp @@ -9,7 +9,7 @@ #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp" #include "Runtime/Input/CFinalInput.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CMessageScreen::CMessageScreen(CAssetId msg, float delayTime) : x74_delayTime(delayTime) { x0_msg = g_SimplePool->GetObj({FOURCC('STRG'), msg}); @@ -132,4 +132,4 @@ void CMessageScreen::Draw() const { x18_loadedMsgScreen->Draw(CGuiWidgetDrawParms(x70_blurAmt, zeus::skZero3f)); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CMessageScreen.hpp b/Runtime/MP1/CMessageScreen.hpp index db52a0678..799ed467f 100644 --- a/Runtime/MP1/CMessageScreen.hpp +++ b/Runtime/MP1/CMessageScreen.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { struct CFinalInput; class CGuiModel; class CGuiTextPane; @@ -46,4 +46,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/COptionsScreen.cpp b/Runtime/MP1/COptionsScreen.cpp index f2bc0035a..f05120a48 100644 --- a/Runtime/MP1/COptionsScreen.cpp +++ b/Runtime/MP1/COptionsScreen.cpp @@ -7,7 +7,7 @@ #include "Runtime/GuiSys/CGuiTextPane.hpp" #include "Runtime/Input/RumbleFxTable.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { COptionsScreen::COptionsScreen(const CStateManager& mgr, CGuiFrame& frame, const CStringTable& pauseStrg) : CPauseScreenBase(mgr, frame, pauseStrg), x1a0_gameCube{std::make_unique()} {} @@ -254,4 +254,4 @@ u32 COptionsScreen::GetRightTableCount() const { return GameOptionsRegistry[x70_tablegroup_leftlog->GetUserSelection()].first; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/COptionsScreen.hpp b/Runtime/MP1/COptionsScreen.hpp index f6c5ccd1e..25ed4369f 100644 --- a/Runtime/MP1/COptionsScreen.hpp +++ b/Runtime/MP1/COptionsScreen.hpp @@ -7,7 +7,7 @@ #include "Runtime/MP1/CPauseScreenBase.hpp" #include "Runtime/MP1/CQuitGameScreen.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class COptionsScreen : public CPauseScreenBase { std::unique_ptr x19c_quitGame; @@ -41,4 +41,4 @@ public: u32 GetRightTableCount() const override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CPauseScreen.cpp b/Runtime/MP1/CPauseScreen.cpp index 209c74e72..7be8de7c9 100644 --- a/Runtime/MP1/CPauseScreen.cpp +++ b/Runtime/MP1/CPauseScreen.cpp @@ -10,7 +10,7 @@ #include "Runtime/MP1/CLogBookScreen.hpp" #include "Runtime/MP1/COptionsScreen.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CPauseScreen::CPauseScreen(ESubScreen subscreen, const CDependencyGroup& suitDgrp, const CDependencyGroup& ballDgrp) : x0_initialSubScreen(subscreen) @@ -354,4 +354,4 @@ float CPauseScreen::GetHelmetCamYOff() const { return 0.f; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CPauseScreen.hpp b/Runtime/MP1/CPauseScreen.hpp index 4233869d9..2178653a6 100644 --- a/Runtime/MP1/CPauseScreen.hpp +++ b/Runtime/MP1/CPauseScreen.hpp @@ -7,7 +7,7 @@ #include "Runtime/MP1/CInGameGuiManager.hpp" #include "Runtime/MP1/CPauseScreenBase.hpp" -namespace urde { +namespace metaforce { class CDependencyGroup; namespace MP1 { @@ -83,4 +83,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CPauseScreenBase.cpp b/Runtime/MP1/CPauseScreenBase.cpp index df04c123e..02b349a4b 100644 --- a/Runtime/MP1/CPauseScreenBase.cpp +++ b/Runtime/MP1/CPauseScreenBase.cpp @@ -15,7 +15,7 @@ #include "Runtime/GuiSys/CStringTable.hpp" #include "Runtime/IMain.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CPauseScreenBase::CPauseScreenBase(const CStateManager& mgr, CGuiFrame& frame, const CStringTable& pauseStrg, bool isLogBook) @@ -531,4 +531,4 @@ std::string CPauseScreenBase::GetImagePaneName(size_t i) { return fmt::format(FMT_STRING("imagepane_pane{}"), PaneSuffixes[i]); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CPauseScreenBase.hpp b/Runtime/MP1/CPauseScreenBase.hpp index 8451e9f37..085b10c02 100644 --- a/Runtime/MP1/CPauseScreenBase.hpp +++ b/Runtime/MP1/CPauseScreenBase.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CArchitectureQueue; class CAuiImagePane; class CGuiModel; @@ -137,4 +137,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CPauseScreenBlur.cpp b/Runtime/MP1/CPauseScreenBlur.cpp index 360b662bb..c797238a2 100644 --- a/Runtime/MP1/CPauseScreenBlur.cpp +++ b/Runtime/MP1/CPauseScreenBlur.cpp @@ -4,7 +4,7 @@ #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/Audio/CSfxManager.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CPauseScreenBlur::CPauseScreenBlur() : x4_mapLightQuarter(g_SimplePool->GetObj("TXTR_MapLightQuarter")) {} @@ -99,4 +99,4 @@ void CPauseScreenBlur::Draw(const CStateManager&) { } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CPauseScreenBlur.hpp b/Runtime/MP1/CPauseScreenBlur.hpp index 1aa04d242..26f2fc8f2 100644 --- a/Runtime/MP1/CPauseScreenBlur.hpp +++ b/Runtime/MP1/CPauseScreenBlur.hpp @@ -7,7 +7,7 @@ #include "Runtime/Graphics/Shaders/CScanLinesFilter.hpp" #include "Runtime/MP1/CInGameGuiManagerCommon.hpp" -namespace urde { +namespace metaforce { class CStateManager; namespace MP1 { @@ -40,4 +40,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CPlayMovie.cpp b/Runtime/MP1/CPlayMovie.cpp index fcffdaf28..2405b6762 100644 --- a/Runtime/MP1/CPlayMovie.cpp +++ b/Runtime/MP1/CPlayMovie.cpp @@ -1,6 +1,6 @@ #include "Runtime/MP1/CPlayMovie.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { const char* kMovies[] = {"Video/wingame.thp", "Video/wingame_best.thp", "Video/wingame_best.thp", "Video/losegame.thp", "Video/05_tallonText.thp", "Video/AfterCredits.thp", @@ -12,4 +12,4 @@ CPlayMovie::CPlayMovie(EWhichMovie which) : CPlayMovieBase("CPlayMovie", kMovies (void)x18_which; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CPlayMovie.hpp b/Runtime/MP1/CPlayMovie.hpp index c0b5dd0ee..f83430333 100644 --- a/Runtime/MP1/CPlayMovie.hpp +++ b/Runtime/MP1/CPlayMovie.hpp @@ -3,7 +3,7 @@ #include "Runtime/CPlayMovieBase.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CPlayMovie : public CPlayMovieBase { public: @@ -31,4 +31,4 @@ public: explicit CPlayMovie(EWhichMovie which); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CPlayerVisor.cpp b/Runtime/MP1/CPlayerVisor.cpp index 1d53ed93c..8e6a4f501 100644 --- a/Runtime/MP1/CPlayerVisor.cpp +++ b/Runtime/MP1/CPlayerVisor.cpp @@ -12,7 +12,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CPlayerVisor::CPlayerVisor(CStateManager&) : x108_newScanPane(EFilterType::Blend, CGraphics::g_SpareTexture.get()) { xcc_scanFrameCorner = g_SimplePool->GetObj("CMDL_ScanFrameCorner"); @@ -676,4 +676,4 @@ float CPlayerVisor::GetDesiredViewportScaleY(const CStateManager& mgr) const { return mgr.GetPlayerState()->GetActiveVisor(mgr) == CPlayerState::EPlayerVisor::Combat ? 1.f : xc8_vpScaleY; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CPlayerVisor.hpp b/Runtime/MP1/CPlayerVisor.hpp index 594b999d8..6d3f14258 100644 --- a/Runtime/MP1/CPlayerVisor.hpp +++ b/Runtime/MP1/CPlayerVisor.hpp @@ -11,7 +11,7 @@ #include -namespace urde { +namespace metaforce { class CStateManager; class CTargetingManager; @@ -92,4 +92,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CPreFrontEnd.cpp b/Runtime/MP1/CPreFrontEnd.cpp index b9f7d5ee7..e21ec0c66 100644 --- a/Runtime/MP1/CPreFrontEnd.cpp +++ b/Runtime/MP1/CPreFrontEnd.cpp @@ -4,7 +4,7 @@ #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/MP1/MP1.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CPreFrontEnd::CPreFrontEnd() : CIOWin("Pre front-end window") {} @@ -28,4 +28,4 @@ CIOWin::EMessageReturn CPreFrontEnd::OnMessage(const CArchitectureMessage& msg, return EMessageReturn::RemoveIOWinAndExit; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CPreFrontEnd.hpp b/Runtime/MP1/CPreFrontEnd.hpp index 54a2c02f8..3e955553e 100644 --- a/Runtime/MP1/CPreFrontEnd.hpp +++ b/Runtime/MP1/CPreFrontEnd.hpp @@ -2,7 +2,7 @@ #include "Runtime/CIOWin.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CPreFrontEnd : public CIOWin { bool x14_resourceTweaksRegistered = false; @@ -12,4 +12,4 @@ public: EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CQuitGameScreen.cpp b/Runtime/MP1/CQuitGameScreen.cpp index a51d63fe1..d96b72254 100644 --- a/Runtime/MP1/CQuitGameScreen.cpp +++ b/Runtime/MP1/CQuitGameScreen.cpp @@ -14,7 +14,7 @@ #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp" #include "Runtime/GuiSys/CStringTable.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr std::array Titles{24, 25, 26, 27, 28}; @@ -117,4 +117,4 @@ CQuitGameScreen::CQuitGameScreen(EQuitType tp) : x0_type(tp) { m_blackScreen.emplace(EFilterType::Blend); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CQuitGameScreen.hpp b/Runtime/MP1/CQuitGameScreen.hpp index ea339d06a..7cf7deeab 100644 --- a/Runtime/MP1/CQuitGameScreen.hpp +++ b/Runtime/MP1/CQuitGameScreen.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp" -namespace urde { +namespace metaforce { struct CFinalInput; class CGuiFrame; class CGuiTableGroup; @@ -40,4 +40,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CSamusDoll.cpp b/Runtime/MP1/CSamusDoll.cpp index 3aa911875..877339a33 100644 --- a/Runtime/MP1/CSamusDoll.cpp +++ b/Runtime/MP1/CSamusDoll.cpp @@ -16,7 +16,7 @@ #include #include -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::array, 8> SpiderBallGlassModels{{ {"SamusSpiderBallGlassCMDL", 0}, @@ -734,4 +734,4 @@ void CSamusDoll::BeginViewInterpolate(bool zoomIn) { x80_fixedZoom = zoomIn ? -2.2f : -3.6f; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CSamusDoll.hpp b/Runtime/MP1/CSamusDoll.hpp index 48ac340e3..756579e6e 100644 --- a/Runtime/MP1/CSamusDoll.hpp +++ b/Runtime/MP1/CSamusDoll.hpp @@ -18,7 +18,7 @@ #include #include -namespace urde { +namespace metaforce { class CDependencyGroup; namespace MP1 { @@ -111,4 +111,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CSamusFaceReflection.cpp b/Runtime/MP1/CSamusFaceReflection.cpp index 5754dd92c..430397d27 100644 --- a/Runtime/MP1/CSamusFaceReflection.cpp +++ b/Runtime/MP1/CSamusFaceReflection.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { static const zeus::CTransform PreXf = zeus::CTransform::Scale(0.3f) * zeus::CTransform::Translate(0.f, 0.5f, 0.f); @@ -102,4 +102,4 @@ void CSamusFaceReflection::Update(float dt, const CStateManager& mgr, CRandom16& } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CSamusFaceReflection.hpp b/Runtime/MP1/CSamusFaceReflection.hpp index e44fb60b8..fa2ed5f1f 100644 --- a/Runtime/MP1/CSamusFaceReflection.hpp +++ b/Runtime/MP1/CSamusFaceReflection.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CSamusFaceReflection { CModelData x0_modelData; @@ -25,4 +25,4 @@ public: void Update(float dt, const CStateManager& stateMgr, CRandom16& rand); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CSamusHud.cpp b/Runtime/MP1/CSamusHud.cpp index fdef4b36b..0555e2a80 100644 --- a/Runtime/MP1/CSamusHud.cpp +++ b/Runtime/MP1/CSamusHud.cpp @@ -15,7 +15,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CSamusHud* CSamusHud::g_SamusHud = nullptr; @@ -1653,4 +1653,4 @@ void CSamusHud::InternalDeferHintMemo(CAssetId strg, u32 strgIdx, const CHUDMemo x554_hudMemoIdx = strgIdx; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CSamusHud.hpp b/Runtime/MP1/CSamusHud.hpp index 136556e03..f8ca033bb 100644 --- a/Runtime/MP1/CSamusHud.hpp +++ b/Runtime/MP1/CSamusHud.hpp @@ -28,7 +28,7 @@ #include #include -namespace urde { +namespace metaforce { class CGuiFrame; class CGuiLight; class CStateManager; @@ -237,4 +237,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CSaveGameScreen.cpp b/Runtime/MP1/CSaveGameScreen.cpp index e3e46f049..d55d8cba8 100644 --- a/Runtime/MP1/CSaveGameScreen.cpp +++ b/Runtime/MP1/CSaveGameScreen.cpp @@ -10,7 +10,7 @@ #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp" #include "Runtime/MP1/MP1.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { using EState = CMemoryCardDriver::EState; using EError = CMemoryCardDriver::EError; @@ -643,4 +643,4 @@ std::unique_ptr CSaveGameScreen::ConstructCardDriver(bool imp g_ResFactory->GetResourceIdByName("TXTR_SaveIcon1")->id, importPersistent); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CSaveGameScreen.hpp b/Runtime/MP1/CSaveGameScreen.hpp index 1c4175fbe..635fd3c6c 100644 --- a/Runtime/MP1/CSaveGameScreen.hpp +++ b/Runtime/MP1/CSaveGameScreen.hpp @@ -10,7 +10,7 @@ #include "Runtime/MP1/CSaveGameScreenTouchBar.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CGuiTableGroup; class CGuiTextPane; class CSaveWorld; @@ -112,4 +112,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CSaveGameScreenTouchBar.cpp b/Runtime/MP1/CSaveGameScreenTouchBar.cpp index 281a5d968..583b62db0 100644 --- a/Runtime/MP1/CSaveGameScreenTouchBar.cpp +++ b/Runtime/MP1/CSaveGameScreenTouchBar.cpp @@ -1,6 +1,6 @@ #include "Runtime/MP1/CSaveGameScreenTouchBar.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { int CSaveGameScreenTouchBar::PopOption() { return -1; } void CSaveGameScreenTouchBar::SetUIOpts(std::u16string_view opt0, std::u16string_view opt1, std::u16string_view opt2) {} @@ -9,4 +9,4 @@ void CSaveGameScreenTouchBar::SetUIOpts(std::u16string_view opt0, std::u16string std::unique_ptr NewSaveUITouchBar() { return std::make_unique(); } #endif -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CSaveGameScreenTouchBar.hpp b/Runtime/MP1/CSaveGameScreenTouchBar.hpp index 3e5f2b31e..181a817b7 100644 --- a/Runtime/MP1/CSaveGameScreenTouchBar.hpp +++ b/Runtime/MP1/CSaveGameScreenTouchBar.hpp @@ -4,7 +4,7 @@ #include #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CSaveGameScreenTouchBar { public: @@ -15,4 +15,4 @@ public: std::unique_ptr NewSaveUITouchBar(); -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CSaveGameScreenTouchBarMac.mm b/Runtime/MP1/CSaveGameScreenTouchBarMac.mm index 03364a63d..085b7f538 100644 --- a/Runtime/MP1/CSaveGameScreenTouchBarMac.mm +++ b/Runtime/MP1/CSaveGameScreenTouchBarMac.mm @@ -84,7 +84,7 @@ } @end -namespace urde::MP1 +namespace metaforce::MP1 { class CSaveGameScreenTouchBarMac : public CSaveGameScreenTouchBar diff --git a/Runtime/MP1/CSlideShow.cpp b/Runtime/MP1/CSlideShow.cpp index 12b86fa14..c94b5964c 100644 --- a/Runtime/MP1/CSlideShow.cpp +++ b/Runtime/MP1/CSlideShow.cpp @@ -5,7 +5,7 @@ #include "Editor/ProjectManager.hpp" #include "Runtime/GameGlobalObjects.hpp" -namespace urde { +namespace metaforce { namespace { bool AreAllDepsLoaded(const std::vector>& deps) { return std::all_of(deps.cbegin(), deps.cend(), [](const auto& dep) { return dep.IsLoaded(); }); @@ -152,4 +152,4 @@ u32 CSlideShow::SlideShowGalleryFlags() { return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CSlideShow.hpp b/Runtime/MP1/CSlideShow.hpp index 0c6d9ecab..706375ddc 100644 --- a/Runtime/MP1/CSlideShow.hpp +++ b/Runtime/MP1/CSlideShow.hpp @@ -16,7 +16,7 @@ #include #include -namespace urde { +namespace metaforce { class CTexture; class CSlideShow : public CIOWin { @@ -108,4 +108,4 @@ public: static u32 SlideShowGalleryFlags(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CSplashScreen.cpp b/Runtime/MP1/CSplashScreen.cpp index 316071f77..7baf77840 100644 --- a/Runtime/MP1/CSplashScreen.cpp +++ b/Runtime/MP1/CSplashScreen.cpp @@ -5,7 +5,7 @@ #include "CArchitectureMessage.hpp" #include "zeus/CColor.hpp" -namespace urde { +namespace metaforce { extern CSimplePool* g_simplePool; namespace MP1 { static const char* SplashTextures[] = {"TXTR_NintendLogo", "TXTR_RetroLogo", "TXTR_DolbyLogo"}; @@ -64,4 +64,4 @@ void CSplashScreen::Draw() const { } } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/CSplashScreen.hpp b/Runtime/MP1/CSplashScreen.hpp index b0f8a27eb..38e249883 100644 --- a/Runtime/MP1/CSplashScreen.hpp +++ b/Runtime/MP1/CSplashScreen.hpp @@ -3,7 +3,7 @@ #include "CIOWin.hpp" #include "CToken.hpp" -namespace urde { +namespace metaforce { class CTexture; namespace MP1 { class CSplashScreen : public CIOWin { diff --git a/Runtime/MP1/CStateSetterFlow.cpp b/Runtime/MP1/CStateSetterFlow.cpp index 3ebcedb74..6a9e69870 100644 --- a/Runtime/MP1/CStateSetterFlow.cpp +++ b/Runtime/MP1/CStateSetterFlow.cpp @@ -4,7 +4,7 @@ #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/MP1/MP1.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CStateSetterFlow::CStateSetterFlow() : CIOWin("") {} @@ -50,4 +50,4 @@ CIOWin::EMessageReturn CStateSetterFlow::OnMessage(const CArchitectureMessage& m return EMessageReturn::Exit; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CStateSetterFlow.hpp b/Runtime/MP1/CStateSetterFlow.hpp index 25e1a1d85..6ca7c81f6 100644 --- a/Runtime/MP1/CStateSetterFlow.hpp +++ b/Runtime/MP1/CStateSetterFlow.hpp @@ -2,7 +2,7 @@ #include "Runtime/CIOWin.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CStateSetterFlow : public CIOWin { public: @@ -10,4 +10,4 @@ public: EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CTweaks.cpp b/Runtime/MP1/CTweaks.cpp index fb9d86943..8343ffb39 100644 --- a/Runtime/MP1/CTweaks.cpp +++ b/Runtime/MP1/CTweaks.cpp @@ -21,7 +21,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { static logvisor::Module Log("MP1::CTweaks"); @@ -134,4 +134,4 @@ void CTweaks::RegisterResourceTweaks(hecl::CVarManager* cvarMgr) { g_tweakPlayerRes->initCVars(cvarMgr); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/CTweaks.hpp b/Runtime/MP1/CTweaks.hpp index c9977e523..0a0770fa9 100644 --- a/Runtime/MP1/CTweaks.hpp +++ b/Runtime/MP1/CTweaks.hpp @@ -6,7 +6,7 @@ namespace hecl { class CVarManager; } -namespace urde { +namespace metaforce { namespace MP1 { @@ -17,4 +17,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/MP1.cpp b/Runtime/MP1/MP1.cpp index 33d500159..33ee7bc74 100644 --- a/Runtime/MP1/MP1.cpp +++ b/Runtime/MP1/MP1.cpp @@ -72,7 +72,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { struct AudioGroupInfo { const char* name; @@ -1103,4 +1103,4 @@ int CMain::appMain(boo::IApplication* app) { #endif -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/MP1.hpp b/Runtime/MP1/MP1.hpp index c71b39f17..17d7d0ece 100644 --- a/Runtime/MP1/MP1.hpp +++ b/Runtime/MP1/MP1.hpp @@ -42,7 +42,7 @@ struct DiscordUser; -namespace urde { +namespace metaforce { class IFactory; class IObjectStore; @@ -257,7 +257,7 @@ private: bool m_firstFrame = true; using delta_clock = std::chrono::high_resolution_clock; std::chrono::time_point m_prevFrameTime; - DataSpec::URDEVersionInfo m_version; + DataSpec::MetaforceVersionInfo m_version; void InitializeSubsystems(); static void InitializeDiscord(); @@ -340,4 +340,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CActorContraption.cpp b/Runtime/MP1/World/CActorContraption.cpp index 17cd3bb1f..a516c35f1 100644 --- a/Runtime/MP1/World/CActorContraption.cpp +++ b/Runtime/MP1/World/CActorContraption.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { MP1::CActorContraption::CActorContraption(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const zeus::CAABox& aabox, @@ -101,4 +101,4 @@ CFlameThrower* MP1::CActorContraption::CreateFlameThrower(std::string_view name, mgr.AddObject(ret); return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CActorContraption.hpp b/Runtime/MP1/World/CActorContraption.hpp index ede6bba12..a120663c9 100644 --- a/Runtime/MP1/World/CActorContraption.hpp +++ b/Runtime/MP1/World/CActorContraption.hpp @@ -7,7 +7,7 @@ #include "Runtime/World/CDamageInfo.hpp" #include "Runtime/World/CScriptActor.hpp" -namespace urde { +namespace metaforce { class CFlameThrower; namespace MP1 { class CActorContraption : public CScriptActor { @@ -31,4 +31,4 @@ public: void ResetFlameThrowers(CStateManager& mgr); }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CAtomicAlpha.cpp b/Runtime/MP1/World/CAtomicAlpha.cpp index 11dd29f66..63a62cad3 100644 --- a/Runtime/MP1/World/CAtomicAlpha.cpp +++ b/Runtime/MP1/World/CAtomicAlpha.cpp @@ -9,7 +9,7 @@ #include "Runtime/World/CPlayer.hpp" #include "Runtime/World/CWorld.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr std::array skBombLocators{ "bomb1_LCTR"sv, "bomb2_LCTR"sv, @@ -163,4 +163,4 @@ void CAtomicAlpha::Attack(CStateManager& mgr, EStateMsg msg, float) { x450_bodyController->SetLocomotionType(pas::ELocomotionType::Relaxed); } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CAtomicAlpha.hpp b/Runtime/MP1/World/CAtomicAlpha.hpp index d69a79f58..7d4316541 100644 --- a/Runtime/MP1/World/CAtomicAlpha.hpp +++ b/Runtime/MP1/World/CAtomicAlpha.hpp @@ -7,7 +7,7 @@ #include "Runtime/World/CPatterned.hpp" #include "Runtime/World/CPathFindSearch.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CAtomicAlpha : public CPatterned { static constexpr u32 skBombCount = 4; struct SBomb { @@ -60,4 +60,4 @@ public: CProjectileInfo* GetProjectileInfo() override { return &x668_bombProjectile; } }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CAtomicBeta.cpp b/Runtime/MP1/World/CAtomicBeta.cpp index 43e5e3e56..c614f5178 100644 --- a/Runtime/MP1/World/CAtomicBeta.cpp +++ b/Runtime/MP1/World/CAtomicBeta.cpp @@ -10,7 +10,7 @@ #include "Runtime/Weapon/CPlayerGun.hpp" #include "Runtime/World/CPlayer.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr std::array skBombLocators{ "bomb2_LCTR"sv, "bomb3_LCTR"sv, @@ -172,4 +172,4 @@ bool CAtomicBeta::IsPlayerBeamChargedEnough(const CStateManager& mgr) { const CPlayerGun* gun = mgr.GetPlayer().GetPlayerGun(); return (gun->IsCharging() ? gun->GetChargeBeamFactor() : 0.f) > 0.1f; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CAtomicBeta.hpp b/Runtime/MP1/World/CAtomicBeta.hpp index 2e8cd388a..5e7e87540 100644 --- a/Runtime/MP1/World/CAtomicBeta.hpp +++ b/Runtime/MP1/World/CAtomicBeta.hpp @@ -7,11 +7,11 @@ #include -namespace urde { +namespace metaforce { class CWeaponDescription; } -namespace urde::MP1 { +namespace metaforce::MP1 { class CAtomicBeta final : public CPatterned { static constexpr u32 kBombCount = 3; rstl::reserved_vector x568_projectileIds; @@ -63,4 +63,4 @@ public: void Death(CStateManager&, const zeus::CVector3f&, EScriptObjectState) override; static bool IsPlayerBeamChargedEnough(const CStateManager& mgr); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CBabygoth.cpp b/Runtime/MP1/World/CBabygoth.cpp index 2d7dd9597..a701a2082 100644 --- a/Runtime/MP1/World/CBabygoth.cpp +++ b/Runtime/MP1/World/CBabygoth.cpp @@ -22,7 +22,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr std::string_view skpMouthDamageJoint = "LCTR_SHEMOUTH"sv; constexpr std::array skSphereJointList{{ @@ -1238,4 +1238,4 @@ bool CBabygoth::Listen(const zeus::CVector3f& origin, EListenNoiseType noiseType xa48_30_heardPlayerFire = true; return true; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CBabygoth.hpp b/Runtime/MP1/World/CBabygoth.hpp index adf19e027..c72534c26 100644 --- a/Runtime/MP1/World/CBabygoth.hpp +++ b/Runtime/MP1/World/CBabygoth.hpp @@ -9,12 +9,12 @@ #include "Runtime/World/CPathFindSearch.hpp" #include "Runtime/World/CPatterned.hpp" -namespace urde { +namespace metaforce { class CCollisionActorManager; class CWeaponDescription; -} // namespace urde +} // namespace metaforce -namespace urde::MP1 { +namespace metaforce::MP1 { struct CBabygothData { float x0_fireballAttackTime; float x4_fireballAttackTimeVariance; @@ -315,4 +315,4 @@ public: CProjectileInfo* GetProjectileInfo() override { return &x958_iceProjectile; } }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CBeetle.cpp b/Runtime/MP1/World/CBeetle.cpp index 36978c170..3a15939e0 100644 --- a/Runtime/MP1/World/CBeetle.cpp +++ b/Runtime/MP1/World/CBeetle.cpp @@ -12,7 +12,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CBeetle::CBeetle(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo, CPatterned::EFlavorType flavor, @@ -984,4 +984,4 @@ CPathFindSearch* CBeetle::GetSearchPath() { return &x5fc_pathFindSearch; } float CBeetle::GetGravityConstant() const { return 4.f * CPhysicsActor::GravityConstant(); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CBeetle.hpp b/Runtime/MP1/World/CBeetle.hpp index cffd48f2a..962fcf097 100644 --- a/Runtime/MP1/World/CBeetle.hpp +++ b/Runtime/MP1/World/CBeetle.hpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { namespace MP1 { class CBeetle : public CPatterned { @@ -117,4 +117,4 @@ public: float GetGravityConstant() const override; }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CBloodFlower.cpp b/Runtime/MP1/World/CBloodFlower.cpp index 1991851f5..049cc63e3 100644 --- a/Runtime/MP1/World/CBloodFlower.cpp +++ b/Runtime/MP1/World/CBloodFlower.cpp @@ -12,7 +12,7 @@ #include "Runtime/World/CPlayer.hpp" #include "Runtime/World/CScriptTrigger.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CBloodFlower::CBloodFlower(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo, CAssetId partId1, CAssetId wpscId1, const CActorParameters& actParms, CAssetId wpscId2, const CDamageInfo& dInfo1, @@ -268,4 +268,4 @@ CTargetableProjectile* CBloodFlower::CreateArcProjectile(CStateManager& mgr, con return targProj; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CBloodFlower.hpp b/Runtime/MP1/World/CBloodFlower.hpp index 294fc5b72..d7b0ca2a0 100644 --- a/Runtime/MP1/World/CBloodFlower.hpp +++ b/Runtime/MP1/World/CBloodFlower.hpp @@ -6,14 +6,14 @@ #include "Runtime/Weapon/CProjectileInfo.hpp" #include "Runtime/World/CPatterned.hpp" -namespace urde { +namespace metaforce { class CGenDescription; class CElementGen; class CWeaponDescription; class CTargetableProjectile; -} // namespace urde +} // namespace metaforce -namespace urde::MP1 { +namespace metaforce::MP1 { class CBloodFlower : public CPatterned { TLockedToken x568_podEffectDesc; std::unique_ptr x574_podEffect; @@ -69,4 +69,4 @@ public: void BulbAttack(CStateManager&, EStateMsg, float) override; void PodAttack(CStateManager&, EStateMsg, float) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CBouncyGrenade.cpp b/Runtime/MP1/World/CBouncyGrenade.cpp index 4ebf026d7..42e3d650f 100644 --- a/Runtime/MP1/World/CBouncyGrenade.cpp +++ b/Runtime/MP1/World/CBouncyGrenade.cpp @@ -8,7 +8,7 @@ #include "Runtime/World/CPlayer.hpp" #include "Runtime/Collision/CCollisionActor.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CBouncyGrenade::CBouncyGrenade(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CActorParameters& actParams, TUniqueId parentId, const SBouncyGrenadeData& data, float velocity, @@ -207,4 +207,4 @@ void CBouncyGrenade::Explode(CStateManager& mgr, TUniqueId uid) { } } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CBouncyGrenade.hpp b/Runtime/MP1/World/CBouncyGrenade.hpp index 678373bfd..f3445791f 100644 --- a/Runtime/MP1/World/CBouncyGrenade.hpp +++ b/Runtime/MP1/World/CBouncyGrenade.hpp @@ -8,7 +8,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { struct SGrenadeVelocityInfo { private: float x0_mass; @@ -88,4 +88,4 @@ public: private: void Explode(CStateManager& mgr, TUniqueId uid); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CBurrower.cpp b/Runtime/MP1/World/CBurrower.cpp index 91f87ed92..b898c9980 100644 --- a/Runtime/MP1/World/CBurrower.cpp +++ b/Runtime/MP1/World/CBurrower.cpp @@ -11,7 +11,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr CDamageVulnerability skVulnerability{ EVulnerability::Deflect, EVulnerability::Deflect, EVulnerability::Deflect, EVulnerability::Deflect, @@ -295,4 +295,4 @@ const std::optional>& CBurrower::GetDeathExplosion return x520_deathExplosionParticle; } -} // namespace urde::MP1 \ No newline at end of file +} // namespace metaforce::MP1 \ No newline at end of file diff --git a/Runtime/MP1/World/CBurrower.hpp b/Runtime/MP1/World/CBurrower.hpp index 46dac3999..b0ad4dfcd 100644 --- a/Runtime/MP1/World/CBurrower.hpp +++ b/Runtime/MP1/World/CBurrower.hpp @@ -4,7 +4,7 @@ #include "Runtime/World/CPatterned.hpp" #include "Runtime/World/CPathFindSearch.hpp" -namespace urde { +namespace metaforce { class CElementGen; namespace MP1 { @@ -51,4 +51,4 @@ public: const std::optional>& GetDeathExplosionParticle() const override; }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CChozoGhost.cpp b/Runtime/MP1/World/CChozoGhost.cpp index 138a6f862..b6464c02d 100644 --- a/Runtime/MP1/World/CChozoGhost.cpp +++ b/Runtime/MP1/World/CChozoGhost.cpp @@ -13,7 +13,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CChozoGhost::CBehaveChance::CBehaveChance(CInputStream& in) : x0_propertyCount(in.readUint32Big()) , x4_lurk(in.readFloatBig()) @@ -759,4 +759,4 @@ void CChozoGhost::FindBestAnchor(CStateManager& mgr) { x2e0_destPos = GetTranslation(); } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CChozoGhost.hpp b/Runtime/MP1/World/CChozoGhost.hpp index f698674d9..35d024e82 100644 --- a/Runtime/MP1/World/CChozoGhost.hpp +++ b/Runtime/MP1/World/CChozoGhost.hpp @@ -9,7 +9,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { enum class EBehaveType { Lurk, Taunt, Attack, Move, None }; class CChozoGhost : public CPatterned { @@ -149,4 +149,4 @@ public: float GetGravityConstant() const override { return 60.f; } CProjectileInfo* GetProjectileInfo() override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CDrone.cpp b/Runtime/MP1/World/CDrone.cpp index 40f68b3bc..abc0a17c2 100644 --- a/Runtime/MP1/World/CDrone.cpp +++ b/Runtime/MP1/World/CDrone.cpp @@ -23,7 +23,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { CDrone::CDrone(TUniqueId uid, std::string_view name, EFlavorType flavor, const CEntityInfo& info, const zeus::CTransform& xf, float f1, CModelData&& mData, const CPatternedInfo& pInfo, const CActorParameters& actParms, EMovementType movement, EColliderType colliderType, EBodyType bodyType, @@ -1184,4 +1184,4 @@ void CDrone::Dead(CStateManager& mgr, EStateMsg msg, float arg) { } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CDrone.hpp b/Runtime/MP1/World/CDrone.hpp index a27cbbb0e..ba2d6e109 100644 --- a/Runtime/MP1/World/CDrone.hpp +++ b/Runtime/MP1/World/CDrone.hpp @@ -5,7 +5,7 @@ #include "Runtime/World/CPathFindSearch.hpp" #include "Runtime/World/CVisorFlare.hpp" -namespace urde { +namespace metaforce { class CWeaponDescription; namespace MP1 { class CDrone : public CPatterned { @@ -176,4 +176,4 @@ public: virtual int sub_8015f150() { return 3; } }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CDroneLaser.cpp b/Runtime/MP1/World/CDroneLaser.cpp index 848eb7a8c..2caf94e92 100644 --- a/Runtime/MP1/World/CDroneLaser.cpp +++ b/Runtime/MP1/World/CDroneLaser.cpp @@ -10,7 +10,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CDroneLaser::CDroneLaser(TUniqueId uid, TAreaId aId, const zeus::CTransform& xf, CAssetId particle) : CActor(uid, true, "DroneLaser"sv, CEntityInfo(aId, CEntity::NullConnectionList), xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::NoStepLogic), CActorParameters::None().HotInThermal(true), kInvalidUniqueId) @@ -86,4 +86,4 @@ void CDroneLaser::sub_80167754(CStateManager& mgr, const zeus::CVector3f& pos, c x104_beamParticle->SetTranslation(pos); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CDroneLaser.hpp b/Runtime/MP1/World/CDroneLaser.hpp index e415025f6..b4b497cb4 100644 --- a/Runtime/MP1/World/CDroneLaser.hpp +++ b/Runtime/MP1/World/CDroneLaser.hpp @@ -1,7 +1,7 @@ #pragma once #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CElementGen; namespace MP1 { class CDroneLaser : public CActor { @@ -25,4 +25,4 @@ public: void sub_80167754(CStateManager& mgr, const zeus::CVector3f& pos, const zeus::CVector3f& look); }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CElitePirate.cpp b/Runtime/MP1/World/CElitePirate.cpp index 82bbe2973..867c0f08e 100644 --- a/Runtime/MP1/World/CElitePirate.cpp +++ b/Runtime/MP1/World/CElitePirate.cpp @@ -19,7 +19,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::array skLeftArmJointList{{ {"L_shoulder", "L_elbow", 1.f, 1.5f}, @@ -1213,4 +1213,4 @@ void CElitePirate::SPositionHistory::AddValue(const zeus::CVector3f& pos) { x4_values.emplace_back(pos); } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CElitePirate.hpp b/Runtime/MP1/World/CElitePirate.hpp index 7155947ab..df40598a2 100644 --- a/Runtime/MP1/World/CElitePirate.hpp +++ b/Runtime/MP1/World/CElitePirate.hpp @@ -10,7 +10,7 @@ #include "Runtime/World/CPathFindSearch.hpp" #include "Runtime/World/CPatterned.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CElitePirateData { private: float x0_tauntInterval; @@ -243,4 +243,4 @@ private: const zeus::CVector3f& projectilePos) const; void ShakeCamera(CStateManager& mgr); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CEnergyBall.cpp b/Runtime/MP1/World/CEnergyBall.cpp index dc0e1377e..18a1a3f64 100644 --- a/Runtime/MP1/World/CEnergyBall.cpp +++ b/Runtime/MP1/World/CEnergyBall.cpp @@ -6,7 +6,7 @@ #include "Runtime/World/CPatternedInfo.hpp" #include "Runtime/World/CPlayer.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CEnergyBall::CEnergyBall(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CActorParameters& actParms, const CPatternedInfo& pInfo, s32 w1, float f1, const CDamageInfo& dInfo1, float f2, const CAssetId& a1, s16 sfxId1, diff --git a/Runtime/MP1/World/CEnergyBall.hpp b/Runtime/MP1/World/CEnergyBall.hpp index 2333b9c4c..6bcd59cfe 100644 --- a/Runtime/MP1/World/CEnergyBall.hpp +++ b/Runtime/MP1/World/CEnergyBall.hpp @@ -7,7 +7,7 @@ #include "Runtime/World/CDamageInfo.hpp" #include "Runtime/World/CPatterned.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CEnergyBall : public CPatterned { CSteeringBehaviors x568_steeringBehaviors; float x56c_ = 0.f; diff --git a/Runtime/MP1/World/CEyeball.cpp b/Runtime/MP1/World/CEyeball.cpp index 5ed3ebd6c..7c723e130 100644 --- a/Runtime/MP1/World/CEyeball.cpp +++ b/Runtime/MP1/World/CEyeball.cpp @@ -10,7 +10,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr std::string_view skEyeLocator = "Laser_LCTR"sv; CEyeball::CEyeball(TUniqueId uid, std::string_view name, CPatterned::EFlavorType flavor, const CEntityInfo& info, @@ -247,4 +247,4 @@ void CEyeball::Death(CStateManager& mgr, const zeus::CVector3f& pos, EScriptObje CPatterned::Death(mgr, pos, state); SetTransform(oldXf); } -} // namespace urde::MP1 \ No newline at end of file +} // namespace metaforce::MP1 \ No newline at end of file diff --git a/Runtime/MP1/World/CEyeball.hpp b/Runtime/MP1/World/CEyeball.hpp index cbfc0176e..8204d5293 100644 --- a/Runtime/MP1/World/CEyeball.hpp +++ b/Runtime/MP1/World/CEyeball.hpp @@ -10,7 +10,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CEyeball : public CPatterned { float x568_attackDelay; float x56c_attackStartTime; @@ -64,4 +64,4 @@ public: bool ShouldAttack(CStateManager&, float) override { return x60c_26_alert; } bool ShouldFire(CStateManager&, float) override { return !x60c_27_attackDisabled; } }; -} // namespace urde::MP1 \ No newline at end of file +} // namespace metaforce::MP1 \ No newline at end of file diff --git a/Runtime/MP1/World/CFireFlea.cpp b/Runtime/MP1/World/CFireFlea.cpp index d57cdf1bf..4b5b2d161 100644 --- a/Runtime/MP1/World/CFireFlea.cpp +++ b/Runtime/MP1/World/CFireFlea.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr zeus::CColor skEndFadeColor{1.f, 1.f, 0.5f, 1.f}; constexpr zeus::CColor skStartFadeColor{1.f, 0.f, 0.f, 0.f}; @@ -97,7 +97,7 @@ bool CFireFlea::InPosition(CStateManager& mgr, float dt) { return (xd80_targetPos - GetTranslation()).magnitude() < 25.f; } -bool CFireFlea::HearShot(urde::CStateManager& mgr, float arg) { +bool CFireFlea::HearShot(metaforce::CStateManager& mgr, float arg) { x570_nearList.clear(); mgr.BuildNearList(x570_nearList, zeus::CAABox(GetTranslation() - 10.f, GetTranslation() + 10.f), CMaterialFilter::MakeInclude({EMaterialTypes::Projectile}), nullptr); @@ -211,4 +211,4 @@ void CFireFlea::Flee(CStateManager& mgr, EStateMsg msg, float) { x450_bodyController->SetLocomotionType(pas::ELocomotionType::Relaxed); } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CFireFlea.hpp b/Runtime/MP1/World/CFireFlea.hpp index d95b0d59e..cfae4dd7a 100644 --- a/Runtime/MP1/World/CFireFlea.hpp +++ b/Runtime/MP1/World/CFireFlea.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CFireFlea : public CPatterned { class CDeathCameraEffect : public CEntity { u32 x34_ = 13; @@ -53,4 +53,4 @@ public: void Flee(CStateManager&, EStateMsg, float) override; CPathFindSearch* GetSearchPath() override { return &xd8c_pathFind; } }; -} // namespace urde::MP1 \ No newline at end of file +} // namespace metaforce::MP1 \ No newline at end of file diff --git a/Runtime/MP1/World/CFlaahgra.cpp b/Runtime/MP1/World/CFlaahgra.cpp index 3bf2dc186..a8c3fdb0d 100644 --- a/Runtime/MP1/World/CFlaahgra.cpp +++ b/Runtime/MP1/World/CFlaahgra.cpp @@ -21,7 +21,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr zeus::CColor skFlaahgraDamageColor{0.5f, 0.5f, 0.f, 1.f}; constexpr zeus::CColor skUnkColor{0.5f, 0.f, 0.f, 1.f}; constexpr zeus::CVector3f skUnkVec1{0.5f, 7.f, 0.f}; @@ -1430,4 +1430,4 @@ std::optional CFlaahgraPlants::GetTouchBounds() const { } return x110_aabox; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CFlaahgra.hpp b/Runtime/MP1/World/CFlaahgra.hpp index d3ded2b4c..2f1e0ac92 100644 --- a/Runtime/MP1/World/CFlaahgra.hpp +++ b/Runtime/MP1/World/CFlaahgra.hpp @@ -18,15 +18,15 @@ #include #include -namespace urde { +namespace metaforce { class CBoneTracking; class CCollisionActorManager; class CDependencyGroup; class CElementGen; class CGenDescription; -} // namespace urde +} // namespace metaforce -namespace urde::MP1 { +namespace metaforce::MP1 { class CFlaahgraData { friend class CFlaahgra; float x0_; @@ -242,4 +242,4 @@ public: void SpecialAttack(CStateManager&, EStateMsg, float) override; void Enraged(CStateManager&, EStateMsg, float) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CFlaahgraProjectile.cpp b/Runtime/MP1/World/CFlaahgraProjectile.cpp index e84492835..e226621a4 100644 --- a/Runtime/MP1/World/CFlaahgraProjectile.cpp +++ b/Runtime/MP1/World/CFlaahgraProjectile.cpp @@ -3,7 +3,7 @@ #include "Runtime/CStateManager.hpp" #include "Runtime/World/CPlayer.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CFlaahgraProjectile::CFlaahgraProjectile(bool bigStrike, const TToken& desc, const zeus::CTransform& xf, const CDamageInfo& damage, TUniqueId uid, @@ -26,4 +26,4 @@ void CFlaahgraProjectile::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId se } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CFlaahgraProjectile.hpp b/Runtime/MP1/World/CFlaahgraProjectile.hpp index b7444a1fc..0a593e2ca 100644 --- a/Runtime/MP1/World/CFlaahgraProjectile.hpp +++ b/Runtime/MP1/World/CFlaahgraProjectile.hpp @@ -2,7 +2,7 @@ #include "Runtime/Weapon/CEnergyProjectile.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CFlaahgraProjectile : public CEnergyProjectile { bool x3d8_bigStrike; @@ -14,4 +14,4 @@ public: void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager &mgr) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CFlaahgraTentacle.cpp b/Runtime/MP1/World/CFlaahgraTentacle.cpp index 810a23cd9..f4c58726d 100644 --- a/Runtime/MP1/World/CFlaahgraTentacle.cpp +++ b/Runtime/MP1/World/CFlaahgraTentacle.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::string_view skpTentacleTip = "Arm_12"sv; constexpr std::array skJointList{{ @@ -272,4 +272,4 @@ void CFlaahgraTentacle::Death(CStateManager& mgr, const zeus::CVector3f& directi x400_25_alive = false; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CFlaahgraTentacle.hpp b/Runtime/MP1/World/CFlaahgraTentacle.hpp index fc2ca11e8..c0da6d480 100644 --- a/Runtime/MP1/World/CFlaahgraTentacle.hpp +++ b/Runtime/MP1/World/CFlaahgraTentacle.hpp @@ -9,7 +9,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CFlaahgraTentacle : public CPatterned { s32 x568_ = -1; std::unique_ptr x56c_collisionManager; @@ -53,4 +53,4 @@ public: void InActive(CStateManager&, EStateMsg, float) override; void Death(CStateManager& mgr, const zeus::CVector3f& direction, EScriptObjectState state) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CFlickerBat.cpp b/Runtime/MP1/World/CFlickerBat.cpp index 665a41b9b..7d673675f 100644 --- a/Runtime/MP1/World/CFlickerBat.cpp +++ b/Runtime/MP1/World/CFlickerBat.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CFlickerBat::CFlickerBat(TUniqueId uid, std::string_view name, CPatterned::EFlavorType flavor, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo, @@ -250,4 +250,4 @@ void CFlickerBat::ToggleVisible(CStateManager& mgr) { x578_fadeRemTime = 1.f; x57c_ooFadeDur = 1.f / x578_fadeRemTime; } -} // namespace urde::MP1 \ No newline at end of file +} // namespace metaforce::MP1 \ No newline at end of file diff --git a/Runtime/MP1/World/CFlickerBat.hpp b/Runtime/MP1/World/CFlickerBat.hpp index dc1705324..d064e62cd 100644 --- a/Runtime/MP1/World/CFlickerBat.hpp +++ b/Runtime/MP1/World/CFlickerBat.hpp @@ -2,7 +2,7 @@ #include "Runtime/World/CPatterned.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CFlickerBat final : public CPatterned { public: enum class EFlickerBatState { Visible, Hidden, FadeIn, FadeOut }; @@ -48,4 +48,4 @@ public: void FlickerBatStateChanged(EFlickerBatState, CStateManager&); void CheckStaticIntersection(CStateManager&); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CFlyingPirate.cpp b/Runtime/MP1/World/CFlyingPirate.cpp index 9c485435b..5726d897c 100644 --- a/Runtime/MP1/World/CFlyingPirate.cpp +++ b/Runtime/MP1/World/CFlyingPirate.cpp @@ -19,7 +19,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::array skBurstsFlying{{ {4, {3, 4, 11, 12, -1, 0, 0, 0}, 0.1f, 0.05f}, @@ -1705,4 +1705,4 @@ void CFlyingPirate::Think(float dt, CStateManager& mgr) { } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CFlyingPirate.hpp b/Runtime/MP1/World/CFlyingPirate.hpp index 18bc5d9ec..f3d9b6c06 100644 --- a/Runtime/MP1/World/CFlyingPirate.hpp +++ b/Runtime/MP1/World/CFlyingPirate.hpp @@ -9,7 +9,7 @@ #include "Runtime/World/CPathFindSearch.hpp" #include "Runtime/World/CPatterned.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { enum class EFlyingPirateType : u32 { FlyingPirate = 1, AquaPirate = 2, @@ -215,4 +215,4 @@ private: void AddToTeam(CStateManager& mgr); void RemoveFromTeam(CStateManager& mgr); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CGrenadeLauncher.cpp b/Runtime/MP1/World/CGrenadeLauncher.cpp index 7a464027b..606474e0a 100644 --- a/Runtime/MP1/World/CGrenadeLauncher.cpp +++ b/Runtime/MP1/World/CGrenadeLauncher.cpp @@ -10,7 +10,7 @@ #include "Runtime/World/CPatterned.hpp" #include "Runtime/World/CPlayer.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CGrenadeLauncher::CGrenadeLauncher(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const zeus::CAABox& bounds, const CHealthInfo& healthInfo, const CDamageVulnerability& vulnerability, @@ -337,4 +337,4 @@ void CGrenadeLauncher::LaunchGrenade(CStateManager& mgr) { x3f8_explodePlayerDistance)); } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CGrenadeLauncher.hpp b/Runtime/MP1/World/CGrenadeLauncher.hpp index 611cfe293..b0a1c70a2 100644 --- a/Runtime/MP1/World/CGrenadeLauncher.hpp +++ b/Runtime/MP1/World/CGrenadeLauncher.hpp @@ -19,7 +19,7 @@ #include #include -namespace urde::MP1 { +namespace metaforce::MP1 { struct SGrenadeTrajectoryInfo { private: float x0_velocityMin; @@ -125,4 +125,4 @@ private: void UpdateStartAnimation(); void LaunchGrenade(CStateManager& mgr); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CIceAttackProjectile.cpp b/Runtime/MP1/World/CIceAttackProjectile.cpp index 292860a51..33d87fb7a 100644 --- a/Runtime/MP1/World/CIceAttackProjectile.cpp +++ b/Runtime/MP1/World/CIceAttackProjectile.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CIceAttackProjectile::CIceAttackProjectile(const TToken& gen1, const TToken& gen2, const TToken& gen3, TUniqueId uid, TAreaId areaId, @@ -61,4 +61,4 @@ void CIceAttackProjectile::AddToRenderer(const zeus::CFrustum& frustum, CStateMa void CIceAttackProjectile::Render(CStateManager& mgr) {} void CIceAttackProjectile::Touch(CActor& act, CStateManager& mgr) {} -} // namespace urde::MP1 \ No newline at end of file +} // namespace metaforce::MP1 \ No newline at end of file diff --git a/Runtime/MP1/World/CIceAttackProjectile.hpp b/Runtime/MP1/World/CIceAttackProjectile.hpp index 109de5fcd..7d753c97e 100644 --- a/Runtime/MP1/World/CIceAttackProjectile.hpp +++ b/Runtime/MP1/World/CIceAttackProjectile.hpp @@ -3,7 +3,7 @@ #include "Runtime/World/CActor.hpp" #include "Runtime/World/CDamageInfo.hpp" -namespace urde { +namespace metaforce { class CElementGen; namespace MP1 { class CIceAttackProjectile : public CActor { @@ -52,4 +52,4 @@ public: void Touch(CActor& act, CStateManager& mgr) override; }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CIceSheegoth.cpp b/Runtime/MP1/World/CIceSheegoth.cpp index 8aba1d4bf..544348de8 100644 --- a/Runtime/MP1/World/CIceSheegoth.cpp +++ b/Runtime/MP1/World/CIceSheegoth.cpp @@ -22,7 +22,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::array skSphereJointList = {{ {"Jaw_end_LCTR", 0.55f}, @@ -1510,4 +1510,4 @@ bool CIceSheegoth::IsClosestSheegoth(CStateManager& mgr, const rstl::reserved_ve } return true; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CIceSheegoth.hpp b/Runtime/MP1/World/CIceSheegoth.hpp index 20c1656b7..f1d77115b 100644 --- a/Runtime/MP1/World/CIceSheegoth.hpp +++ b/Runtime/MP1/World/CIceSheegoth.hpp @@ -6,7 +6,7 @@ #include "Runtime/World/CPathFindSearch.hpp" #include "Runtime/World/CPatterned.hpp" -namespace urde { +namespace metaforce { class CCollisionActorManager; class CElementGen; class CParticleElectric; @@ -252,4 +252,4 @@ public: CProjectileInfo* GetProjectileInfo() override { return &xa58_; } }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CJellyZap.cpp b/Runtime/MP1/World/CJellyZap.cpp index bdf201212..aef1a3c0a 100644 --- a/Runtime/MP1/World/CJellyZap.cpp +++ b/Runtime/MP1/World/CJellyZap.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr CMaterialFilter kPlayerFilter = CMaterialFilter::MakeInclude({EMaterialTypes::Player}); CJellyZap::CJellyZap(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, @@ -231,4 +231,4 @@ const CDamageVulnerability* CJellyZap::GetDamageVulnerability(const zeus::CVecto const CDamageInfo& info) const { return CActor::GetDamageVulnerability(pos, dir, info); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CJellyZap.hpp b/Runtime/MP1/World/CJellyZap.hpp index 72e69d073..e4c62c994 100644 --- a/Runtime/MP1/World/CJellyZap.hpp +++ b/Runtime/MP1/World/CJellyZap.hpp @@ -2,7 +2,7 @@ #include "Runtime/World/CPatterned.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CJellyZap : public CPatterned { u32 x568_ = 0; CDamageInfo x56c_attackDamage; @@ -59,4 +59,4 @@ public: bool InAttackPosition(CStateManager&, float) override; bool InDetectionRange(CStateManager&, float) override; }; -} // namespace urde::MP1 \ No newline at end of file +} // namespace metaforce::MP1 \ No newline at end of file diff --git a/Runtime/MP1/World/CMagdolite.cpp b/Runtime/MP1/World/CMagdolite.cpp index 465b39403..bebf5aee5 100644 --- a/Runtime/MP1/World/CMagdolite.cpp +++ b/Runtime/MP1/World/CMagdolite.cpp @@ -15,7 +15,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::array skSpineJoints{{ @@ -676,4 +676,4 @@ TUniqueId CMagdolite::FindSuitableTarget(CStateManager& mgr, EScriptObjectState return tmpId; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CMagdolite.hpp b/Runtime/MP1/World/CMagdolite.hpp index 21ca215bc..a1faceab6 100644 --- a/Runtime/MP1/World/CMagdolite.hpp +++ b/Runtime/MP1/World/CMagdolite.hpp @@ -4,7 +4,7 @@ #include "Runtime/Weapon/CFlameInfo.hpp" #include "Runtime/World/CPatterned.hpp" -namespace urde { +namespace metaforce { class CCollisionActorManager; class CSkinnedModel; class CWeaponDescription; @@ -100,4 +100,4 @@ public: bool ShouldRetreat(CStateManager& mgr, float arg) override; }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CMetaree.cpp b/Runtime/MP1/World/CMetaree.cpp index 2434111cd..2e220799d 100644 --- a/Runtime/MP1/World/CMetaree.cpp +++ b/Runtime/MP1/World/CMetaree.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CMetaree::CMetaree(TUniqueId uid, std::string_view name, EFlavorType flavor, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo, const CDamageInfo& dInfo, float f1, const zeus::CVector3f& v1, float f2, EBodyType bodyType, @@ -177,4 +177,4 @@ bool CMetaree::InRange(CStateManager& mgr, float arg) { } bool CMetaree::ShouldAttack(CStateManager&, float) { return GetTranslation().z() < x584_lookPos.z(); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CMetaree.hpp b/Runtime/MP1/World/CMetaree.hpp index 61ed8eada..cb379eec9 100644 --- a/Runtime/MP1/World/CMetaree.hpp +++ b/Runtime/MP1/World/CMetaree.hpp @@ -7,7 +7,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CMetaree : public CPatterned { float x568_delay; float x56c_haltDelay; @@ -49,4 +49,4 @@ public: bool InRange(CStateManager&, float) override; bool ShouldAttack(CStateManager&, float) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CMetroid.cpp b/Runtime/MP1/World/CMetroid.cpp index e2b7cd344..3a2508aba 100644 --- a/Runtime/MP1/World/CMetroid.cpp +++ b/Runtime/MP1/World/CMetroid.cpp @@ -12,7 +12,7 @@ #include "Runtime/World/ScriptLoader.hpp" #include "Runtime/MP1/World/CMetroidBeta.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr CDamageVulnerability skGammaRedDamageVulnerability{ EVulnerability::Deflect, EVulnerability::Deflect, EVulnerability::Deflect, EVulnerability::Immune, @@ -1451,4 +1451,4 @@ void CMetroid::WallHang(CStateManager& mgr, EStateMsg msg, float dt) { } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CMetroid.hpp b/Runtime/MP1/World/CMetroid.hpp index 154717aa1..42f7c01c5 100644 --- a/Runtime/MP1/World/CMetroid.hpp +++ b/Runtime/MP1/World/CMetroid.hpp @@ -11,7 +11,7 @@ #include "Runtime/World/CPatternedInfo.hpp" #include "Runtime/MP1/World/CSpacePirate.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CMetroidData { private: @@ -207,4 +207,4 @@ private: void UpdateTouchBounds(); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CMetroidBeta.cpp b/Runtime/MP1/World/CMetroidBeta.cpp index 011c0d509..86035acd7 100644 --- a/Runtime/MP1/World/CMetroidBeta.cpp +++ b/Runtime/MP1/World/CMetroidBeta.cpp @@ -15,7 +15,7 @@ #include "Runtime/World/CWorld.hpp" #include "Runtime/World/ScriptLoader.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CMetroidBetaData::CMetroidBetaData(CInputStream& in) : x0_(in) @@ -338,4 +338,4 @@ void CMetroidBeta::AddToTeam(CStateManager& mgr) { CTeamAiRole::ETeamAiRole::Invalid); } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CMetroidBeta.hpp b/Runtime/MP1/World/CMetroidBeta.hpp index f61e50752..e34b58805 100644 --- a/Runtime/MP1/World/CMetroidBeta.hpp +++ b/Runtime/MP1/World/CMetroidBeta.hpp @@ -9,13 +9,13 @@ #include -namespace urde { +namespace metaforce { class CCollisionActorManager; class CElementGen; class CParticleSwoosh; -} // namespace urde +} // namespace metaforce -namespace urde::MP1 { +namespace metaforce::MP1 { class CMetroidBetaData { friend class CMetroidBeta; @@ -143,4 +143,4 @@ public: void RenderHitBallEffect() const; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CMetroidPrimeEssence.cpp b/Runtime/MP1/World/CMetroidPrimeEssence.cpp index e7c7aeaa9..36df76642 100644 --- a/Runtime/MP1/World/CMetroidPrimeEssence.cpp +++ b/Runtime/MP1/World/CMetroidPrimeEssence.cpp @@ -18,7 +18,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { std::array skJointInfo{{ {"lockon_target_LCTR", 1.5f}, @@ -28,11 +28,10 @@ std::array skUnkInts1{{0, 1, 0, 2}}; std::array skUnkInts2{{1, 2, 3}}; } // namespace -CMetroidPrimeEssence::CMetroidPrimeEssence(urde::TUniqueId uid, std::string_view name, const urde::CEntityInfo& info, - const zeus::CTransform& xf, urde::CModelData&& mData, - const urde::CPatternedInfo& pInfo, const urde::CActorParameters& actParms, - urde::CAssetId particle1, const urde::CDamageInfo& dInfo, float f1, - urde::CAssetId electric, u32 w1, urde::CAssetId particle2) +CMetroidPrimeEssence::CMetroidPrimeEssence(metaforce::TUniqueId uid, std::string_view name, const metaforce::CEntityInfo& info, + const zeus::CTransform& xf, + metaforce::CModelData&& mData, + const metaforce::CPatternedInfo& pInfo, const metaforce::CActorParameters& actParms, metaforce::CAssetId particle1, const metaforce::CDamageInfo& dInfo, float f1, metaforce::CAssetId electric, u32 w1, metaforce::CAssetId particle2) : CPatterned(ECharacter::MetroidPrimeEssence, uid, name, EFlavorType::Zero, info, xf, std::move(mData), pInfo, EMovementType::Flyer, EColliderType::One, EBodyType::Flyer, actParms, EKnockBackVariant::Medium) , x568_(g_SimplePool->GetObj({FOURCC('PART'), particle2})) @@ -720,4 +719,4 @@ void CMetroidPrimeEssence::SetupCollisionActorManager(CStateManager& mgr) { AddMaterial(EMaterialTypes::ProjectilePassthrough, mgr); } -} // namespace urde::MP1 \ No newline at end of file +} // namespace metaforce::MP1 \ No newline at end of file diff --git a/Runtime/MP1/World/CMetroidPrimeEssence.hpp b/Runtime/MP1/World/CMetroidPrimeEssence.hpp index 93dfe9624..1846baed6 100644 --- a/Runtime/MP1/World/CMetroidPrimeEssence.hpp +++ b/Runtime/MP1/World/CMetroidPrimeEssence.hpp @@ -5,7 +5,7 @@ #include "Runtime/World/CPathFindSearch.hpp" #include "Runtime/World/CPatterned.hpp" -namespace urde { +namespace metaforce { class CCollisionActorManager; namespace MP1 { class CMetroidPrimeEssence : public CPatterned { @@ -108,4 +108,4 @@ public: CPathFindSearch* GetSearchPath() override; }; } // namespace MP1 -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/MP1/World/CMetroidPrimeExo.cpp b/Runtime/MP1/World/CMetroidPrimeExo.cpp index 7b0f2fcd1..b7ec925d8 100644 --- a/Runtime/MP1/World/CMetroidPrimeExo.cpp +++ b/Runtime/MP1/World/CMetroidPrimeExo.cpp @@ -23,7 +23,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { std::array skLocomotions{{ @@ -1895,4 +1895,4 @@ void CMetroidPrimeExo::SetupCollisionActorManager(CStateManager& mgr) { } void CMetroidPrimeExo::CPhysicsDummy::Accept(IVisitor& visitor) { visitor.Visit(this); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CMetroidPrimeExo.hpp b/Runtime/MP1/World/CMetroidPrimeExo.hpp index c0c0ebe20..f76807295 100644 --- a/Runtime/MP1/World/CMetroidPrimeExo.hpp +++ b/Runtime/MP1/World/CMetroidPrimeExo.hpp @@ -13,7 +13,7 @@ #include -namespace urde { +namespace metaforce { class CCameraShakeData; class CCollisionActorManager; class CGenDescription; @@ -328,4 +328,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CMetroidPrimeProjectile.cpp b/Runtime/MP1/World/CMetroidPrimeProjectile.cpp index 0075db6fe..b56b574d8 100644 --- a/Runtime/MP1/World/CMetroidPrimeProjectile.cpp +++ b/Runtime/MP1/World/CMetroidPrimeProjectile.cpp @@ -3,7 +3,7 @@ #include "Runtime/CSimplePool.hpp" #include "Runtime/GameGlobalObjects.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { SPrimeProjectileInfo::SPrimeProjectileInfo(CInputStream& in) : x0_propertyCount(in.readUint32Big()) @@ -29,4 +29,4 @@ CMetroidPrimeProjectile::CMetroidPrimeProjectile( visorParticle, visorSfx, sendCollideMsg) , x3d8_auxData(auxData) {} -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CMetroidPrimeProjectile.hpp b/Runtime/MP1/World/CMetroidPrimeProjectile.hpp index 0d0db410b..677fdc704 100644 --- a/Runtime/MP1/World/CMetroidPrimeProjectile.hpp +++ b/Runtime/MP1/World/CMetroidPrimeProjectile.hpp @@ -3,7 +3,7 @@ #include "Runtime/CToken.hpp" #include "Runtime/Weapon/CEnergyProjectile.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { struct SPrimeProjectileInfo { u32 x0_propertyCount; @@ -32,4 +32,4 @@ public: bool sendCollideMsg); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CMetroidPrimeRelay.cpp b/Runtime/MP1/World/CMetroidPrimeRelay.cpp index ab3f9d0a1..24a8339d3 100644 --- a/Runtime/MP1/World/CMetroidPrimeRelay.cpp +++ b/Runtime/MP1/World/CMetroidPrimeRelay.cpp @@ -4,7 +4,7 @@ #include "Runtime/CStateManager.hpp" #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CMetroidPrimeRelay::CMetroidPrimeRelay(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active, const zeus::CTransform& xf, const zeus::CVector3f& scale, @@ -69,4 +69,4 @@ void CMetroidPrimeRelay::GetOrBuildMetroidPrimeExo(CStateManager& mgr) { mgr.SendScriptMsg(exo, kInvalidUniqueId, EScriptObjectMessage::InitializedInArea); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CMetroidPrimeRelay.hpp b/Runtime/MP1/World/CMetroidPrimeRelay.hpp index cb95137c9..1b26592cf 100644 --- a/Runtime/MP1/World/CMetroidPrimeRelay.hpp +++ b/Runtime/MP1/World/CMetroidPrimeRelay.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CMetroidPrimeRelay : public CEntity { TUniqueId x34_mpUid = kInvalidUniqueId; @@ -54,4 +54,4 @@ public: }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CNewIntroBoss.cpp b/Runtime/MP1/World/CNewIntroBoss.cpp index d875b6801..691901030 100644 --- a/Runtime/MP1/World/CNewIntroBoss.cpp +++ b/Runtime/MP1/World/CNewIntroBoss.cpp @@ -13,7 +13,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr std::array skSphereJoints{{ {"Head_1", 1.5f}, @@ -354,7 +354,7 @@ bool CNewIntroBoss::ShouldAttack(CStateManager& mgr, float dt) { bool CNewIntroBoss::AIStage(CStateManager& mgr, float) { return x568_locomotion != GetLocoForHealth(mgr); } -bool CNewIntroBoss::AnimOver(urde::CStateManager&, float) { return x56c_stateProg == 3; } +bool CNewIntroBoss::AnimOver(metaforce::CStateManager&, float) { return x56c_stateProg == 3; } void CNewIntroBoss::Generate(CStateManager& mgr, EStateMsg msg, float dt) { if (msg == EStateMsg::Activate) { @@ -434,4 +434,4 @@ void CNewIntroBoss::Patrol(CStateManager& mgr, EStateMsg msg, float dt) { } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CNewIntroBoss.hpp b/Runtime/MP1/World/CNewIntroBoss.hpp index a864b6202..d2f4726f0 100644 --- a/Runtime/MP1/World/CNewIntroBoss.hpp +++ b/Runtime/MP1/World/CNewIntroBoss.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { class CCollisionActorManager; class CDamageInfo; @@ -82,4 +82,4 @@ public: }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/COmegaPirate.cpp b/Runtime/MP1/World/COmegaPirate.cpp index 7805fdcac..d21316245 100644 --- a/Runtime/MP1/World/COmegaPirate.cpp +++ b/Runtime/MP1/World/COmegaPirate.cpp @@ -17,7 +17,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::array skSphereJoints{{ {"lockon_target_LCTR", 1.f}, @@ -1413,4 +1413,4 @@ void COmegaPirate::DeathDestroy(CStateManager& mgr) { xa38_collisionActorMgr1->SetActive(mgr, false); xa9c_collisionActorMgr2->SetActive(mgr, false); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/COmegaPirate.hpp b/Runtime/MP1/World/COmegaPirate.hpp index eec2ec6cc..ef986ea89 100644 --- a/Runtime/MP1/World/COmegaPirate.hpp +++ b/Runtime/MP1/World/COmegaPirate.hpp @@ -2,7 +2,7 @@ #include "Runtime/MP1/World/CElitePirate.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class COmegaPirate : public CElitePirate { private: class CFlash : public CActor { @@ -189,4 +189,4 @@ private: void sub_8028c840(u32 arg, CStateManager& mgr); zeus::CVector3f FindGround(const zeus::CVector3f& pos, CStateManager& mgr) const; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CParasite.cpp b/Runtime/MP1/World/CParasite.cpp index 7d8423cb6..19e89d724 100644 --- a/Runtime/MP1/World/CParasite.cpp +++ b/Runtime/MP1/World/CParasite.cpp @@ -17,7 +17,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { const float CParasite::flt_805A8FB0 = 2.f * std::sqrt(2.5f / CPhysicsActor::GravityConstant()); const float CParasite::skAttackVelocity = 15.f / 2.f * (std::sqrt(2.5f / CPhysicsActor::GravityConstant())); @@ -867,4 +867,4 @@ void CParasite::UpdateJumpVelocity() { SetVelocityWR(vec); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CParasite.hpp b/Runtime/MP1/World/CParasite.hpp index 762ebc478..1a456c7fc 100644 --- a/Runtime/MP1/World/CParasite.hpp +++ b/Runtime/MP1/World/CParasite.hpp @@ -7,11 +7,11 @@ #include -namespace urde { +namespace metaforce { class CModelData; } -namespace urde::MP1 { +namespace metaforce::MP1 { class CParasite : public CWallWalker { class CRepulsor { zeus::CVector3f x0_v; @@ -147,4 +147,4 @@ public: bool IsOnGround() const override; virtual void UpdateWalkerAnimation(CStateManager&, float); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CPhazonHealingNodule.cpp b/Runtime/MP1/World/CPhazonHealingNodule.cpp index cbd7c6692..71fddfde0 100644 --- a/Runtime/MP1/World/CPhazonHealingNodule.cpp +++ b/Runtime/MP1/World/CPhazonHealingNodule.cpp @@ -5,7 +5,7 @@ #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/World/CPatternedInfo.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { CPhazonHealingNodule::CPhazonHealingNodule(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CActorParameters& actParams, const CPatternedInfo& pInfo, @@ -183,4 +183,4 @@ void CPhazonHealingNodule::MassiveFrozenDeath(CStateManager& mgr) { } void CPhazonHealingNodule::PhazeOut(CStateManager& mgr) { Death(mgr, zeus::skZero3f, EScriptObjectState::Dead); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CPhazonHealingNodule.hpp b/Runtime/MP1/World/CPhazonHealingNodule.hpp index d068d822e..e9b5f1f0b 100644 --- a/Runtime/MP1/World/CPhazonHealingNodule.hpp +++ b/Runtime/MP1/World/CPhazonHealingNodule.hpp @@ -3,7 +3,7 @@ #include "Runtime/World/CPatterned.hpp" #include "Runtime/Particle/CParticleElectric.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CPhazonHealingNodule : public CPatterned { private: int x568_active = 0; @@ -47,4 +47,4 @@ public: private: void UpdateParticleElectric(CStateManager& mgr); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CPhazonPool.cpp b/Runtime/MP1/World/CPhazonPool.cpp index a9c4b86f2..38b6bd9d1 100644 --- a/Runtime/MP1/World/CPhazonPool.cpp +++ b/Runtime/MP1/World/CPhazonPool.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CPhazonPool::CPhazonPool(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, const zeus::CVector3f& scale, bool active, CAssetId w1, CAssetId w2, CAssetId w3, CAssetId w4, u32 p11, const CDamageInfo& dInfo, const zeus::CVector3f& orientedForce, @@ -268,4 +268,4 @@ void CPhazonPool::SetEmitParticles(bool val) { x170_elementGen1->SetParticleEmission(val); } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CPhazonPool.hpp b/Runtime/MP1/World/CPhazonPool.hpp index 2a5f8132f..b6f7e1442 100644 --- a/Runtime/MP1/World/CPhazonPool.hpp +++ b/Runtime/MP1/World/CPhazonPool.hpp @@ -4,7 +4,7 @@ #include "Runtime/Particle/CElementGen.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CPhazonPool : public CScriptTrigger { private: std::list> x150_inhabitants; @@ -54,4 +54,4 @@ private: void RemoveInhabitants(CStateManager& mgr); void SetEmitParticles(bool val); }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CPuddleSpore.cpp b/Runtime/MP1/World/CPuddleSpore.cpp index 8118763f7..f00c67b83 100644 --- a/Runtime/MP1/World/CPuddleSpore.cpp +++ b/Runtime/MP1/World/CPuddleSpore.cpp @@ -12,7 +12,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr u32 kEyeCount = 16; constexpr std::array kEyeLocators{ @@ -315,4 +315,4 @@ void CPuddleSpore::Attack(CStateManager& mgr, EStateMsg msg, float) { x32c_animState = EAnimState::NotReady; } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CPuddleSpore.hpp b/Runtime/MP1/World/CPuddleSpore.hpp index a00e9d21b..6e257e655 100644 --- a/Runtime/MP1/World/CPuddleSpore.hpp +++ b/Runtime/MP1/World/CPuddleSpore.hpp @@ -9,7 +9,7 @@ #include "Runtime/Weapon/CProjectileInfo.hpp" #include "Runtime/World/CPatterned.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CPuddleSpore : public CPatterned { float x568_ = 0.f; float x56c_ = 0.f; @@ -81,4 +81,4 @@ public: void GetUp(CStateManager&, EStateMsg, float) override; void Attack(CStateManager&, EStateMsg, float) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CPuddleToadGamma.cpp b/Runtime/MP1/World/CPuddleToadGamma.cpp index 0fe8b5cc6..941185626 100644 --- a/Runtime/MP1/World/CPuddleToadGamma.cpp +++ b/Runtime/MP1/World/CPuddleToadGamma.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr zeus::CVector3f skBellyOffset(0.f, 0.1f, -.3f); @@ -336,4 +336,4 @@ void CPuddleToadGamma::Crouch(CStateManager& mgr, EStateMsg msg, float) { } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CPuddleToadGamma.hpp b/Runtime/MP1/World/CPuddleToadGamma.hpp index 8b5f1a289..a27c47b16 100644 --- a/Runtime/MP1/World/CPuddleToadGamma.hpp +++ b/Runtime/MP1/World/CPuddleToadGamma.hpp @@ -8,7 +8,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CPuddleToadGamma final : public CPatterned { u32 x568_stateProg = 0; @@ -75,4 +75,4 @@ public: bool Inside(CStateManager&, float) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CPuffer.cpp b/Runtime/MP1/World/CPuffer.cpp index 3dbc3c897..890472875 100644 --- a/Runtime/MP1/World/CPuffer.cpp +++ b/Runtime/MP1/World/CPuffer.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { constexpr std::array GasLocators{ "Gas_01_LCTR"sv, "Gas_02_LCTR"sv, "Gas_03_LCTR"sv, "Gas_04_LCTR"sv, "Gas_05_LCTR"sv, @@ -143,4 +143,4 @@ void CPuffer::sub8025bfa4(CStateManager& mgr) { x5d0_enabledParticles = 0; } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CPuffer.hpp b/Runtime/MP1/World/CPuffer.hpp index af8e0c8f9..cba9ab13e 100644 --- a/Runtime/MP1/World/CPuffer.hpp +++ b/Runtime/MP1/World/CPuffer.hpp @@ -7,7 +7,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CPuffer : public CPatterned { zeus::CVector3f x568_face; TToken x574_cloudEffect; @@ -40,4 +40,4 @@ public: void Touch(CActor&, CStateManager&) override; void Death(CStateManager&, const zeus::CVector3f&, EScriptObjectState) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CRidley.cpp b/Runtime/MP1/World/CRidley.cpp index a90ba1566..e8550bdc8 100644 --- a/Runtime/MP1/World/CRidley.cpp +++ b/Runtime/MP1/World/CRidley.cpp @@ -18,7 +18,7 @@ #include "Runtime/World/CScriptWaypoint.hpp" #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { struct SSomeRidleyStruct { u32 x0_; @@ -293,7 +293,7 @@ CRidley::CRidley(TUniqueId uid, std::string_view name, const CEntityInfo& info, CreateShadow(false); } -void CRidley::SetupCollisionActorManager(urde::CStateManager& mgr) { +void CRidley::SetupCollisionActorManager(metaforce::CStateManager& mgr) { const auto& animData = GetModelData()->GetAnimationData(); std::vector joints; joints.reserve(skTail.size()); @@ -836,7 +836,7 @@ void CRidley::sub8025784c(CStateManager& mgr) { xa31_27_ = false; } -void CRidley::sub80255d58(urde::CStateManager& mgr) { +void CRidley::sub80255d58(metaforce::CStateManager& mgr) { xb04_ = skSomeRidleyStruct[xcb0_][xcb4_].x4_ < mgr.GetActiveRandom()->Range(0.f, 100.f) ? skSomeRidleyStruct[xcb0_][xcb4_].x8_ : skSomeRidleyStruct[xcb0_][xcb4_].x0_; @@ -851,7 +851,7 @@ void CRidley::sub80255d58(urde::CStateManager& mgr) { xcc4_ = 1; } -void CRidley::sub80257744(urde::CStateManager& mgr) { +void CRidley::sub80257744(metaforce::CStateManager& mgr) { for (size_t i = 0; i < x984_bodyCollision->GetNumCollisionActors(); ++i) { const auto& colDesc = x984_bodyCollision->GetCollisionDescFromIndex(i); if (TCastToPtr colAct = mgr.ObjectById(colDesc.GetCollisionActorId())) { @@ -865,7 +865,7 @@ void CRidley::sub80257744(urde::CStateManager& mgr) { xa31_27_ = true; } -void CRidley::FirePlasma(urde::CStateManager& mgr) { +void CRidley::FirePlasma(metaforce::CStateManager& mgr) { if (xb64_plasmaProjectile == kInvalidUniqueId) { xb64_plasmaProjectile = mgr.AllocateUniqueId(); mgr.AddObject(new CPlasmaProjectile(xb68_.Token(), ""sv, EWeaponType::AI, x568_data.x64_, {}, @@ -1271,7 +1271,7 @@ void CRidley::CoverAttack(CStateManager& mgr, EStateMsg msg, float arg) { } } -void CRidley::Crouch(urde::CStateManager& mgr, urde::EStateMsg msg, float arg) { +void CRidley::Crouch(metaforce::CStateManager& mgr, metaforce::EStateMsg msg, float arg) { if (msg == EStateMsg::Activate) { SetMomentumWR(GetGravityConstant() * zeus::skDown); if (xc64_aiStage == 3) { @@ -1328,7 +1328,7 @@ void CRidley::Flee(CStateManager& mgr, EStateMsg msg, float arg) { } } -void CRidley::Lurk(urde::CStateManager& mgr, urde::EStateMsg msg, float arg) { +void CRidley::Lurk(metaforce::CStateManager& mgr, metaforce::EStateMsg msg, float arg) { if (msg == EStateMsg::Activate) { if (!xa33_25_) { zeus::CVector3f vec = GetTranslation() - xa84_.origin; @@ -1614,7 +1614,7 @@ bool CRidley::ShouldRetreat(CStateManager& mgr, float arg) { return xa34_26_; } bool CRidley::ShouldCrouch(CStateManager& mgr, float arg) { return xb04_ == 1; } -bool CRidley::ShouldMove(urde::CStateManager& mgr, float arg) { +bool CRidley::ShouldMove(metaforce::CStateManager& mgr, float arg) { if (xb0c_ == 5) { xa34_25_ = true; return true; @@ -1677,7 +1677,7 @@ void CRidley::FacePlayer(float arg, CStateManager& mgr) { x450_bodyController->FaceDirection((mgr.GetPlayer().GetTranslation() - GetTranslation()).normalized(), arg); } -void CRidley::sub80253710(urde::CStateManager& mgr) { +void CRidley::sub80253710(metaforce::CStateManager& mgr) { xb08_ = xb0c_; float fVar1 = 100.f * mgr.GetActiveRandom()->Float(); float fVar6 = 0.f + skFloats[xb08_].x0_; @@ -1724,4 +1724,4 @@ void CRidley::sub80253710(urde::CStateManager& mgr) { if (frontMag > 0.f && diffMag < x2fc_minAttackRange && xb08_ != 4) xb0c_ = 4; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CRidley.hpp b/Runtime/MP1/World/CRidley.hpp index 9c7a92b41..552cc5633 100644 --- a/Runtime/MP1/World/CRidley.hpp +++ b/Runtime/MP1/World/CRidley.hpp @@ -11,7 +11,7 @@ #include "Runtime/World/CPatterned.hpp" #include "Runtime/World/CProjectedShadow.hpp" -namespace urde { +namespace metaforce { class CParticleElectric; namespace MP1 { class CRidleyData { @@ -271,4 +271,4 @@ public: bool IsDizzy(CStateManager& mgr, float arg) override; }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CRipper.cpp b/Runtime/MP1/World/CRipper.cpp index 9796489db..db7c07300 100644 --- a/Runtime/MP1/World/CRipper.cpp +++ b/Runtime/MP1/World/CRipper.cpp @@ -10,7 +10,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CRipper::CRipper(TUniqueId uid, std::string_view name, EFlavorType type, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo, const CActorParameters& actParms, const CGrappleParameters& grappleParms) @@ -184,4 +184,4 @@ zeus::CQuaternion CRipperControlledPlatform::Move(float arg, CStateManager& mgr) } return {}; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CRipper.hpp b/Runtime/MP1/World/CRipper.hpp index cd2774239..7d8b1e19b 100644 --- a/Runtime/MP1/World/CRipper.hpp +++ b/Runtime/MP1/World/CRipper.hpp @@ -4,7 +4,7 @@ #include "Runtime/World/CPatterned.hpp" #include "Runtime/World/CScriptPlatform.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { class CRipper : public CPatterned { CGrappleParameters x568_grappleParams; @@ -49,4 +49,4 @@ public: zeus::CQuaternion Move(float, CStateManager &) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CSeedling.cpp b/Runtime/MP1/World/CSeedling.cpp index 87b73df0c..591f5c1d8 100644 --- a/Runtime/MP1/World/CSeedling.cpp +++ b/Runtime/MP1/World/CSeedling.cpp @@ -10,7 +10,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::array, 2> skNeedleLocators{{ { @@ -226,4 +226,4 @@ void CSeedling::MassiveDeath(CStateManager& mgr) { CPatterned::MassiveDeath(mgr); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CSeedling.hpp b/Runtime/MP1/World/CSeedling.hpp index 38ee49280..04f4747c4 100644 --- a/Runtime/MP1/World/CSeedling.hpp +++ b/Runtime/MP1/World/CSeedling.hpp @@ -9,7 +9,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CSeedling : public CWallWalker { CPathFindSearch x5d8_searchPath; std::unique_ptr x6bc_spikeData; @@ -45,4 +45,4 @@ public: bool ShouldAttack(CStateManager&, float) override; void MassiveDeath(CStateManager&) override; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CShockWave.cpp b/Runtime/MP1/World/CShockWave.cpp index 9ed19e8ef..a6f3f431f 100644 --- a/Runtime/MP1/World/CShockWave.cpp +++ b/Runtime/MP1/World/CShockWave.cpp @@ -12,7 +12,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CShockWave::CShockWave(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, TUniqueId parent, const SShockWaveData& data, float minActiveTime, float knockback) : CActor(uid, true, name, info, xf, CModelData::CModelDataNull(), {EMaterialTypes::Projectile}, @@ -175,4 +175,4 @@ void CShockWave::Touch(CActor& actor, CStateManager& mgr) { bool CShockWave::IsHit(TUniqueId id) const { return std::find(x170_hitIds.begin(), x170_hitIds.end(), id) != x170_hitIds.end(); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CShockWave.hpp b/Runtime/MP1/World/CShockWave.hpp index fd5fc35ed..742f7d507 100644 --- a/Runtime/MP1/World/CShockWave.hpp +++ b/Runtime/MP1/World/CShockWave.hpp @@ -4,7 +4,7 @@ #include "Runtime/World/CActor.hpp" #include "Runtime/World/CDamageInfo.hpp" -namespace urde::MP1 { +namespace metaforce::MP1 { struct SShockWaveData { private: u32 x0_ = 8; @@ -71,4 +71,4 @@ public: private: [[nodiscard]] bool IsHit(TUniqueId id) const; }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CSpacePirate.cpp b/Runtime/MP1/World/CSpacePirate.cpp index 52b21886f..333dde9dd 100644 --- a/Runtime/MP1/World/CSpacePirate.cpp +++ b/Runtime/MP1/World/CSpacePirate.cpp @@ -21,7 +21,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::array skParts{ "Collar"sv, "Neck_1"sv, "R_shoulder"sv, "R_elbow"sv, "R_wrist"sv, "L_shoulder"sv, "L_elbow"sv, @@ -149,7 +149,7 @@ constexpr std::array skBursts{ }; } // Anonymous namespace -CSpacePirate::CSpacePirateData::CSpacePirateData(urde::CInputStream& in, u32 propCount) +CSpacePirate::CSpacePirateData::CSpacePirateData(metaforce::CInputStream& in, u32 propCount) : x0_AggressionCheck(in.readFloatBig()) , x4_CoverCheck(in.readFloatBig()) , x8_SearchRadius(in.readFloatBig()) @@ -2550,4 +2550,4 @@ float CSpacePirate::GetGravityConstant() const { return 50.f; } CProjectileInfo* CSpacePirate::GetProjectileInfo() { return &x568_pirateData.x20_Projectile; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CSpacePirate.hpp b/Runtime/MP1/World/CSpacePirate.hpp index b5b9f359b..c7ec1b081 100644 --- a/Runtime/MP1/World/CSpacePirate.hpp +++ b/Runtime/MP1/World/CSpacePirate.hpp @@ -14,7 +14,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CSpacePirate; class CPirateRagDoll : public CRagDoll { @@ -333,4 +333,4 @@ public: TUniqueId GetAttachedActor() const { return x7b4_attachedActor; } bool IsTrooper() const { return x636_24_trooper; } }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CSpankWeed.cpp b/Runtime/MP1/World/CSpankWeed.cpp index 433f2fba8..3ecc6c777 100644 --- a/Runtime/MP1/World/CSpankWeed.cpp +++ b/Runtime/MP1/World/CSpankWeed.cpp @@ -9,8 +9,8 @@ #include -namespace urde::MP1 { -logvisor::Module SpankLog("urde::MP1::SpankWeed"); +namespace metaforce::MP1 { +logvisor::Module SpankLog("metaforce::MP1::SpankWeed"); constexpr std::array kArmCollision{{ {"Arm_4", 1.5f}, @@ -334,4 +334,4 @@ void CSpankWeed::KnockBack(const zeus::CVector3f& backVec, CStateManager& mgr, c float CSpankWeed::GetPlayerDistance(CStateManager& mgr) const { return (mgr.GetPlayer().GetTranslation() - x5a8_lockonTarget).magSquared(); } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CSpankWeed.hpp b/Runtime/MP1/World/CSpankWeed.hpp index 978d27e4d..8227083a2 100644 --- a/Runtime/MP1/World/CSpankWeed.hpp +++ b/Runtime/MP1/World/CSpankWeed.hpp @@ -7,7 +7,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CSpankWeed : public CPatterned { float x568_maxDetectionRange; float x56c_detectionHeightRange; @@ -53,4 +53,4 @@ public: void KnockBack(const zeus::CVector3f&, CStateManager&, const CDamageInfo& info, EKnockBackType type, bool inDeferred, float magnitude) override; }; -} // namespace urde::MP1 \ No newline at end of file +} // namespace metaforce::MP1 \ No newline at end of file diff --git a/Runtime/MP1/World/CThardus.cpp b/Runtime/MP1/World/CThardus.cpp index 2a5ecb400..2bf1e2167 100644 --- a/Runtime/MP1/World/CThardus.cpp +++ b/Runtime/MP1/World/CThardus.cpp @@ -26,7 +26,7 @@ #include #include -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::array skDamageableSphereJointInfoList1{{ {"R_knee", 1.f}, @@ -1181,7 +1181,7 @@ bool CThardus::ShouldTurn(CStateManager& mgr, float arg) { } bool CThardus::HitSomething(CStateManager& mgr, float arg) { return mgr.GetPlayer().GetFrozenState(); } -void CThardus::GatherWaypoints(urde::CScriptWaypoint* wp, urde::CStateManager& mgr, +void CThardus::GatherWaypoints(metaforce::CScriptWaypoint* wp, metaforce::CStateManager& mgr, rstl::reserved_vector& uids) { if (uids.size() < uids.capacity() && wp->GetActive()) { uids.push_back(wp->GetUniqueId()); @@ -1349,7 +1349,7 @@ void CThardus::sub801dbbdc(CStateManager& mgr, CDestroyableRock* rock) { } void CThardus::UpdateNonDestroyableCollisionActorMaterials(EUpdateMaterialMode mode, EMaterialTypes mat, - urde::CStateManager& mgr) { + metaforce::CStateManager& mgr) { for (const auto& uid : x634_nonDestroyableActors) { if (TCastToPtr col = mgr.ObjectById(uid)) { if (mode == EUpdateMaterialMode::Remove) { @@ -1594,4 +1594,4 @@ zeus::CVector2f CThardus::sub801dc60c(float arg, CStateManager& mgr) { return ret; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CThardus.hpp b/Runtime/MP1/World/CThardus.hpp index 49dd4135c..e48179da3 100644 --- a/Runtime/MP1/World/CThardus.hpp +++ b/Runtime/MP1/World/CThardus.hpp @@ -4,7 +4,7 @@ #include "Runtime/World/CPatterned.hpp" #include "Runtime/World/CPathFindSearch.hpp" -namespace urde { +namespace metaforce { class CCollisionActorManager; namespace MP1 { class CThardus : public CPatterned { @@ -257,4 +257,4 @@ public: const zeus::CVector3f& v1); }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CThardusRockProjectile.cpp b/Runtime/MP1/World/CThardusRockProjectile.cpp index c6631619f..d0038053a 100644 --- a/Runtime/MP1/World/CThardusRockProjectile.cpp +++ b/Runtime/MP1/World/CThardusRockProjectile.cpp @@ -18,7 +18,7 @@ #include "Runtime/MP1/World/CThardus.hpp" #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { namespace { constexpr std::array skRockCollisions{{ {"Rock_01_Collision_LCTR", 1.5f}, @@ -413,4 +413,4 @@ void CThardusRockProjectile::UpdateDestroyableRockCollisionActors(CStateManager& } } } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CThardusRockProjectile.hpp b/Runtime/MP1/World/CThardusRockProjectile.hpp index 414e3bbfa..8f3b0cd8b 100644 --- a/Runtime/MP1/World/CThardusRockProjectile.hpp +++ b/Runtime/MP1/World/CThardusRockProjectile.hpp @@ -2,7 +2,7 @@ #include "Runtime/World/CPatterned.hpp" #include "Runtime/Collision/CJointCollisionDescription.hpp" -namespace urde { +namespace metaforce { class CCollisionActorManager; struct SSphereJointInfo; namespace MP1 { @@ -69,4 +69,4 @@ public: bool ShouldMove(CStateManager& mgr, float arg) override; }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MP1/World/CTryclops.cpp b/Runtime/MP1/World/CTryclops.cpp index 9f153e81e..ed4fee8f2 100644 --- a/Runtime/MP1/World/CTryclops.cpp +++ b/Runtime/MP1/World/CTryclops.cpp @@ -12,7 +12,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { const CDamageVulnerability CTryclops::skVulnerabilities = CDamageVulnerability( EVulnerability::Deflect, EVulnerability::Deflect, EVulnerability::Deflect, EVulnerability::Deflect, EVulnerability::Deflect, EVulnerability::Normal, EVulnerability::Deflect, EVulnerability::Deflect, @@ -661,4 +661,4 @@ bool CTryclops::sub8025dbd0(CStateManager& mgr) { return false; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CTryclops.hpp b/Runtime/MP1/World/CTryclops.hpp index 6d951b121..a62808b8c 100644 --- a/Runtime/MP1/World/CTryclops.hpp +++ b/Runtime/MP1/World/CTryclops.hpp @@ -5,7 +5,7 @@ #include -namespace urde::MP1 { +namespace metaforce::MP1 { class CTryclops : public CPatterned { static const CDamageVulnerability skVulnerabilities; @@ -91,4 +91,4 @@ public: bool IsDizzy(CStateManager&, float) override; CPathFindSearch* GetSearchPath() override { return &x568_pathFindSearch; } }; -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CWarWasp.cpp b/Runtime/MP1/World/CWarWasp.cpp index c84d9bf53..f9f4069a9 100644 --- a/Runtime/MP1/World/CWarWasp.cpp +++ b/Runtime/MP1/World/CWarWasp.cpp @@ -14,7 +14,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde::MP1 { +namespace metaforce::MP1 { CWarWasp::CWarWasp(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo, CPatterned::EFlavorType flavor, CPatterned::EColliderType collider, const CDamageInfo& dInfo1, const CActorParameters& actorParms, @@ -1222,4 +1222,4 @@ bool CWarWasp::ShouldSpecialAttack(CStateManager& mgr, float arg) { CPathFindSearch* CWarWasp::GetSearchPath() { return &x590_pfSearch; } CProjectileInfo* CWarWasp::GetProjectileInfo() { return &x6d4_projectileInfo; } -} // namespace urde::MP1 +} // namespace metaforce::MP1 diff --git a/Runtime/MP1/World/CWarWasp.hpp b/Runtime/MP1/World/CWarWasp.hpp index 77d0df813..02f2eacd9 100644 --- a/Runtime/MP1/World/CWarWasp.hpp +++ b/Runtime/MP1/World/CWarWasp.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class CDamageInfo; namespace MP1 { class CWarWasp : public CPatterned { @@ -119,4 +119,4 @@ public: CProjectileInfo* GetProjectileInfo() override; }; } // namespace MP1 -} // namespace urde +} // namespace metaforce diff --git a/Runtime/MkCastTo.py b/Runtime/MkCastTo.py index 2864c154c..a53a411ec 100644 --- a/Runtime/MkCastTo.py +++ b/Runtime/MkCastTo.py @@ -90,7 +90,7 @@ sourcef = open('TCastTo.cpp', 'w') headerf.write('''#pragma once -namespace urde { +namespace metaforce { class CEntity; ''') @@ -164,7 +164,7 @@ for tp in CENTITY_TYPES: sourcef.write('#include "%s"\n' % tp[1]) sourcef.write(''' -namespace urde { +namespace metaforce { template TCastToPtr::TCastToPtr(CEntity* p) { if (p) p->Accept(*this); else ptr = nullptr; } diff --git a/Runtime/Particle/CColorElement.cpp b/Runtime/Particle/CColorElement.cpp index 482312bff..6650c97b0 100644 --- a/Runtime/Particle/CColorElement.cpp +++ b/Runtime/Particle/CColorElement.cpp @@ -9,7 +9,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Color_Elements */ -namespace urde { +namespace metaforce { CCEKeyframeEmitter::CCEKeyframeEmitter(CInputStream& in) { x4_percent = in.readUint32Big(); @@ -141,4 +141,4 @@ bool CCEParticleColor::GetValue(int /*frame*/, zeus::CColor& colorOut) const { return false; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CColorElement.hpp b/Runtime/Particle/CColorElement.hpp index 1323aceef..41998157a 100644 --- a/Runtime/Particle/CColorElement.hpp +++ b/Runtime/Particle/CColorElement.hpp @@ -8,7 +8,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Color_Elements */ -namespace urde { +namespace metaforce { class CCEKeyframeEmitter : public CColorElement { u32 x4_percent; @@ -97,4 +97,4 @@ class CCEParticleColor : public CColorElement { public: bool GetValue(int frame, zeus::CColor& colorOut) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CDecal.cpp b/Runtime/Particle/CDecal.cpp index 607b68b7d..33a3be6ff 100644 --- a/Runtime/Particle/CDecal.cpp +++ b/Runtime/Particle/CDecal.cpp @@ -4,7 +4,7 @@ #include "Runtime/Graphics/Shaders/CDecalShaders.hpp" #include "Runtime/Particle/CParticleGlobals.hpp" -namespace urde { +namespace metaforce { CRandom16 CDecal::sDecalRandom; bool CDecal::sMoveRedToAlphaBuffer = false; @@ -269,4 +269,4 @@ void CDecal::Update(float dt) { ++x58_frameIdx; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CDecal.hpp b/Runtime/Particle/CDecal.hpp index 1614f3fed..2dd7b0bf3 100644 --- a/Runtime/Particle/CDecal.hpp +++ b/Runtime/Particle/CDecal.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { struct SQuadDescr; struct CQuadDecal { bool x0_24_invalid : 1 = true; @@ -52,4 +52,4 @@ public: static void SetGlobalSeed(u16); static void SetMoveRedToAlphaBuffer(bool); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CDecalDataFactory.cpp b/Runtime/Particle/CDecalDataFactory.cpp index 91af4022d..7500438b0 100644 --- a/Runtime/Particle/CDecalDataFactory.cpp +++ b/Runtime/Particle/CDecalDataFactory.cpp @@ -5,8 +5,8 @@ #include "Runtime/Graphics/CModel.hpp" #include "Runtime/Particle/CParticleDataFactory.hpp" -namespace urde { -static logvisor::Module Log("urde::CDecalDataFactory"); +namespace metaforce { +static logvisor::Module Log("metaforce::CDecalDataFactory"); using CPF = CParticleDataFactory; std::unique_ptr CDecalDataFactory::GetGeneratorDesc(CInputStream& in, CSimplePool* resPool) { @@ -130,4 +130,4 @@ CFactoryFnReturn FDecalDataFactory(const SObjectTag& tag, CInputStream& in, cons CSimplePool* sp = vparms.GetOwnedObj(); return TToken::GetIObjObjectFor(CDecalDataFactory::GetGeneratorDesc(in, sp)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CDecalDataFactory.hpp b/Runtime/Particle/CDecalDataFactory.hpp index 54628447a..f4676af8d 100644 --- a/Runtime/Particle/CDecalDataFactory.hpp +++ b/Runtime/Particle/CDecalDataFactory.hpp @@ -9,7 +9,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Particle/CDecalDescription.hpp" -namespace urde { +namespace metaforce { class CSimplePool; class CDecalDataFactory { @@ -23,4 +23,4 @@ public: CFactoryFnReturn FDecalDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference*); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CDecalDescription.hpp b/Runtime/Particle/CDecalDescription.hpp index 2af2b111c..0da845f15 100644 --- a/Runtime/Particle/CDecalDescription.hpp +++ b/Runtime/Particle/CDecalDescription.hpp @@ -9,7 +9,7 @@ #include "Runtime/Particle/CUVElement.hpp" #include "Runtime/Particle/CVectorElement.hpp" -namespace urde { +namespace metaforce { struct SQuadDescr { std::unique_ptr x0_LFT; @@ -36,4 +36,4 @@ public: bool x5c_25_DMOO : 1 = false; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CDecalManager.cpp b/Runtime/Particle/CDecalManager.cpp index 19b94ec98..2412c51ea 100644 --- a/Runtime/Particle/CDecalManager.cpp +++ b/Runtime/Particle/CDecalManager.cpp @@ -7,7 +7,7 @@ #include "Runtime/Particle/CDecal.hpp" #include "Runtime/Particle/CDecalDescription.hpp" -namespace urde { +namespace metaforce { bool CDecalManager::m_PoolInitialized = false; s32 CDecalManager::m_FreeIndex = 63; float CDecalManager::m_DeltaTimeSinceLastDecalCreation = 0.f; @@ -116,4 +116,4 @@ void CDecalManager::AddDecal(const TToken& decal, const zeus: m_ActiveIndexList.push_back(thisIndex); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CDecalManager.hpp b/Runtime/Particle/CDecalManager.hpp index 7cd26f285..f5e84704e 100644 --- a/Runtime/Particle/CDecalManager.hpp +++ b/Runtime/Particle/CDecalManager.hpp @@ -8,7 +8,7 @@ #include "Runtime/Particle/CDecal.hpp" #include -namespace urde { +namespace metaforce { class CStateManager; class CDecalManager { @@ -41,4 +41,4 @@ public: CStateManager& mgr); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CElectricDescription.hpp b/Runtime/Particle/CElectricDescription.hpp index 54580af28..80532a864 100644 --- a/Runtime/Particle/CElectricDescription.hpp +++ b/Runtime/Particle/CElectricDescription.hpp @@ -10,7 +10,7 @@ #include "Runtime/Particle/CUVElement.hpp" #include "Runtime/Particle/CVectorElement.hpp" -namespace urde { +namespace metaforce { class CElectricDescription { public: std::unique_ptr x0_LIFE; @@ -34,4 +34,4 @@ public: SChildGeneratorDesc x60_EPSM; bool x70_ZERY = false; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CElementGen.cpp b/Runtime/Particle/CElementGen.cpp index f6f1e72a5..021320283 100644 --- a/Runtime/Particle/CElementGen.cpp +++ b/Runtime/Particle/CElementGen.cpp @@ -15,9 +15,9 @@ #define MAX_GLOBAL_PARTICLES 2560 -namespace urde { +namespace metaforce { namespace { -logvisor::Module Log("urde::CElementGen"); +logvisor::Module Log("metaforce::CElementGen"); constexpr std::array ShadClsSizes{ sizeof(SParticleInstanceTex), @@ -1913,4 +1913,4 @@ void CElementGen::Reset() { void CElementGen::SetMoveRedToAlphaBuffer(bool move) { sMoveRedToAlphaBuffer = move; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CElementGen.hpp b/Runtime/Particle/CElementGen.hpp index 1230e493f..7920a3415 100644 --- a/Runtime/Particle/CElementGen.hpp +++ b/Runtime/Particle/CElementGen.hpp @@ -18,7 +18,7 @@ #include #include -namespace urde { +namespace metaforce { class CActorLights; class CGenDescription; class CLight; @@ -229,4 +229,4 @@ public: }; ENABLE_BITWISE_ENUM(CElementGen::EOptionalSystemFlags) -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CEmitterElement.cpp b/Runtime/Particle/CEmitterElement.cpp index 08feb3d12..a3f2eebb5 100644 --- a/Runtime/Particle/CEmitterElement.cpp +++ b/Runtime/Particle/CEmitterElement.cpp @@ -4,7 +4,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Emitter_Elements */ -namespace urde { +namespace metaforce { bool CEESimpleEmitter::GetValue(int frame, zeus::CVector3f& pPos, zeus::CVector3f& pVel) const { x4_loc->GetValue(frame, pPos); @@ -71,4 +71,4 @@ bool CVEAngleSphere::GetValue(int frame, zeus::CVector3f& pPos, zeus::CVector3f& return false; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CEmitterElement.hpp b/Runtime/Particle/CEmitterElement.hpp index 8d8969d0d..73fbb42d4 100644 --- a/Runtime/Particle/CEmitterElement.hpp +++ b/Runtime/Particle/CEmitterElement.hpp @@ -5,7 +5,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Emitter_Elements */ -namespace urde { +namespace metaforce { class CEESimpleEmitter : public CEmitterElement { std::unique_ptr x4_loc; @@ -52,4 +52,4 @@ public: bool GetValue(int frame, zeus::CVector3f& pPos, zeus::CVector3f& pVel) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CFlameWarp.cpp b/Runtime/Particle/CFlameWarp.cpp index 2cc4e6e68..ed43e6706 100644 --- a/Runtime/Particle/CFlameWarp.cpp +++ b/Runtime/Particle/CFlameWarp.cpp @@ -4,7 +4,7 @@ #include "Runtime/CStateManager.hpp" -namespace urde { +namespace metaforce { void CFlameWarp::ModifyParticles(std::vector& particles) { if (x9c_stateMgr == nullptr || particles.size() < 9) { @@ -99,4 +99,4 @@ zeus::CAABox CFlameWarp::CalculateBounds() const { return ret; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CFlameWarp.hpp b/Runtime/Particle/CFlameWarp.hpp index 6e414dcc8..8f4eccb80 100644 --- a/Runtime/Particle/CFlameWarp.hpp +++ b/Runtime/Particle/CFlameWarp.hpp @@ -6,7 +6,7 @@ #include #include -namespace urde { +namespace metaforce { class CStateManager; class CFlameWarp : public CWarp { @@ -48,4 +48,4 @@ public: void ResetPosition(const zeus::CVector3f& pos); zeus::CAABox CalculateBounds() const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CGenDescription.hpp b/Runtime/Particle/CGenDescription.hpp index 8593d426a..4687e8455 100644 --- a/Runtime/Particle/CGenDescription.hpp +++ b/Runtime/Particle/CGenDescription.hpp @@ -14,7 +14,7 @@ /* Documentation at: https://wiki.axiodl.com/w/PART_(File_Format) */ -namespace urde { +namespace metaforce { class CGenDescription { public: @@ -110,4 +110,4 @@ public: CGenDescription() = default; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CIntElement.cpp b/Runtime/Particle/CIntElement.cpp index 6367dfa1e..9109ab937 100644 --- a/Runtime/Particle/CIntElement.cpp +++ b/Runtime/Particle/CIntElement.cpp @@ -9,7 +9,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Int_Elements */ -namespace urde { +namespace metaforce { CIEKeyframeEmitter::CIEKeyframeEmitter(CInputStream& in) { x4_percent = in.readUint32Big(); @@ -299,4 +299,4 @@ int CIERealToInt::GetMaxValue() const { return 1; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CIntElement.hpp b/Runtime/Particle/CIntElement.hpp index f9d490b86..b47011242 100644 --- a/Runtime/Particle/CIntElement.hpp +++ b/Runtime/Particle/CIntElement.hpp @@ -7,7 +7,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Int_Elements */ -namespace urde { +namespace metaforce { class CIEKeyframeEmitter : public CIntElement { u32 x4_percent; @@ -218,4 +218,4 @@ public: int GetMaxValue() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CModVectorElement.cpp b/Runtime/Particle/CModVectorElement.cpp index 05b8ea66f..ff0163f42 100644 --- a/Runtime/Particle/CModVectorElement.cpp +++ b/Runtime/Particle/CModVectorElement.cpp @@ -7,7 +7,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Mod_Vector_Elements */ -namespace urde { +namespace metaforce { bool CMVEImplosion::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const { zeus::CVector3f av; @@ -237,4 +237,4 @@ bool CMVESwirl::GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos return false; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CModVectorElement.hpp b/Runtime/Particle/CModVectorElement.hpp index f7fcf4600..5d5e95f89 100644 --- a/Runtime/Particle/CModVectorElement.hpp +++ b/Runtime/Particle/CModVectorElement.hpp @@ -5,7 +5,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Mod_Vector_Elements */ -namespace urde { +namespace metaforce { class CMVEImplosion : public CModVectorElement { std::unique_ptr x4_implPoint; @@ -173,4 +173,4 @@ public: bool GetValue(int frame, zeus::CVector3f& pVel, zeus::CVector3f& pPos) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleDataFactory.cpp b/Runtime/Particle/CParticleDataFactory.cpp index fe8454601..95125c537 100644 --- a/Runtime/Particle/CParticleDataFactory.cpp +++ b/Runtime/Particle/CParticleDataFactory.cpp @@ -8,8 +8,8 @@ #include "Runtime/Particle/CGenDescription.hpp" #include "Runtime/Particle/CSwooshDescription.hpp" -namespace urde { -static logvisor::Module Log("urde::CParticleDataFactory"); +namespace metaforce { +static logvisor::Module Log("metaforce::CParticleDataFactory"); float CParticleDataFactory::GetReal(CInputStream& in) { return in.readFloatBig(); } @@ -1036,4 +1036,4 @@ CFactoryFnReturn FParticleFactory(const SObjectTag& tag, CInputStream& in, const return TToken::GetIObjObjectFor(CParticleDataFactory::GetGeneratorDesc(in, sp)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleDataFactory.hpp b/Runtime/Particle/CParticleDataFactory.hpp index 889a5fac3..b5ea0e839 100644 --- a/Runtime/Particle/CParticleDataFactory.hpp +++ b/Runtime/Particle/CParticleDataFactory.hpp @@ -10,7 +10,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Graphics/CModel.hpp" -namespace urde { +namespace metaforce { class CColorElement; class CElectricDescription; class CEmitterElement; @@ -99,7 +99,7 @@ public: CFactoryFnReturn FParticleFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference* selfRef); -} // namespace urde +} // namespace metaforce // FIXME hacky workaround for MSVC; these need to be complete types // but introduce circular dependencies if included at the start diff --git a/Runtime/Particle/CParticleElectric.cpp b/Runtime/Particle/CParticleElectric.cpp index 06f520e9f..226a40493 100644 --- a/Runtime/Particle/CParticleElectric.cpp +++ b/Runtime/Particle/CParticleElectric.cpp @@ -16,7 +16,7 @@ #include #include -namespace urde { +namespace metaforce { u16 CParticleElectric::g_GlobalSeed = 99; @@ -830,4 +830,4 @@ void CParticleElectric::DestroyParticles() { // Empty } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleElectric.hpp b/Runtime/Particle/CParticleElectric.hpp index 013630235..8077fbbc9 100644 --- a/Runtime/Particle/CParticleElectric.hpp +++ b/Runtime/Particle/CParticleElectric.hpp @@ -19,7 +19,7 @@ #include #include -namespace urde { +namespace metaforce { class CElectricDescription; class CParticleElectric : public CParticleGen { @@ -146,4 +146,4 @@ public: FourCC Get4CharId() const override { return FOURCC('ELSC'); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleElectricDataFactory.cpp b/Runtime/Particle/CParticleElectricDataFactory.cpp index 7f4059ebd..b1e8293d6 100644 --- a/Runtime/Particle/CParticleElectricDataFactory.cpp +++ b/Runtime/Particle/CParticleElectricDataFactory.cpp @@ -6,8 +6,8 @@ #include "Runtime/Graphics/CModel.hpp" #include "Runtime/Particle/CElectricDescription.hpp" -namespace urde { -static logvisor::Module Log("urde::CParticleElectricDataFactory"); +namespace metaforce { +static logvisor::Module Log("metaforce::CParticleElectricDataFactory"); using CPF = CParticleDataFactory; @@ -128,4 +128,4 @@ CFactoryFnReturn FParticleElectricDataFactory(const SObjectTag& tag, CInputStrea CSimplePool* sp = vparms.GetOwnedObj(); return TToken::GetIObjObjectFor(CParticleElectricDataFactory::GetGeneratorDesc(in, sp)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleElectricDataFactory.hpp b/Runtime/Particle/CParticleElectricDataFactory.hpp index 7ec5e749e..692a12741 100644 --- a/Runtime/Particle/CParticleElectricDataFactory.hpp +++ b/Runtime/Particle/CParticleElectricDataFactory.hpp @@ -8,7 +8,7 @@ #include "Runtime/IObj.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CElectricDescription; class CSimplePool; class CParticleElectricDataFactory { @@ -22,4 +22,4 @@ public: CFactoryFnReturn FParticleElectricDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference*); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleGen.cpp b/Runtime/Particle/CParticleGen.cpp index 632bcd37a..90845d99e 100644 --- a/Runtime/Particle/CParticleGen.cpp +++ b/Runtime/Particle/CParticleGen.cpp @@ -1,7 +1,7 @@ #include "Runtime/Particle/CParticleGen.hpp" -namespace urde { +namespace metaforce { void CParticleGen::AddModifier(CWarp* mod) { x4_modifierList.push_back(mod); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleGen.hpp b/Runtime/Particle/CParticleGen.hpp index b6387d1f6..39513bc1a 100644 --- a/Runtime/Particle/CParticleGen.hpp +++ b/Runtime/Particle/CParticleGen.hpp @@ -11,7 +11,7 @@ #include #include -namespace urde { +namespace metaforce { class CWarp; class CActorLights; @@ -64,4 +64,4 @@ public: virtual void AddModifier(CWarp* mod); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleGlobals.cpp b/Runtime/Particle/CParticleGlobals.cpp index 3bd62e8e3..20856a3dd 100644 --- a/Runtime/Particle/CParticleGlobals.cpp +++ b/Runtime/Particle/CParticleGlobals.cpp @@ -1,5 +1,5 @@ #include "Runtime/Particle/CParticleGlobals.hpp" -namespace urde { +namespace metaforce { std::unique_ptr CParticleGlobals::g_ParticleGlobals; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleGlobals.hpp b/Runtime/Particle/CParticleGlobals.hpp index cea7df8f4..e8a755311 100644 --- a/Runtime/Particle/CParticleGlobals.hpp +++ b/Runtime/Particle/CParticleGlobals.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { class CElementGen; class CParticleGlobals { CParticleGlobals() = default; @@ -85,4 +85,4 @@ struct SParticleUniforms { zeus::CColor moduColor; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleSwoosh.cpp b/Runtime/Particle/CParticleSwoosh.cpp index 0d69faac4..d19da4176 100644 --- a/Runtime/Particle/CParticleSwoosh.cpp +++ b/Runtime/Particle/CParticleSwoosh.cpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { int CParticleSwoosh::g_ParticleSystemAliveCount = 0; @@ -1084,4 +1084,4 @@ void CParticleSwoosh::DestroyParticles() { // Empty } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleSwoosh.hpp b/Runtime/Particle/CParticleSwoosh.hpp index 86658a640..a1e241533 100644 --- a/Runtime/Particle/CParticleSwoosh.hpp +++ b/Runtime/Particle/CParticleSwoosh.hpp @@ -18,7 +18,7 @@ #include #include -namespace urde { +namespace metaforce { class CSwooshDescription; class CParticleSwoosh : public CParticleGen { @@ -225,4 +225,4 @@ public: static u32 GetAliveParticleSystemCount() { return g_ParticleSystemAliveCount; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleSwooshDataFactory.cpp b/Runtime/Particle/CParticleSwooshDataFactory.cpp index 76ef71e19..407f33ad6 100644 --- a/Runtime/Particle/CParticleSwooshDataFactory.cpp +++ b/Runtime/Particle/CParticleSwooshDataFactory.cpp @@ -7,8 +7,8 @@ #include "Runtime/Particle/CGenDescription.hpp" #include "Runtime/Particle/CSwooshDescription.hpp" -namespace urde { -static logvisor::Module Log("urde::CParticleSwooshDataFactory"); +namespace metaforce { +static logvisor::Module Log("metaforce::CParticleSwooshDataFactory"); using CPF = CParticleDataFactory; @@ -137,4 +137,4 @@ CFactoryFnReturn FParticleSwooshDataFactory(const SObjectTag& tag, CInputStream& CSimplePool* sp = vparms.GetOwnedObj(); return TToken::GetIObjObjectFor(CParticleSwooshDataFactory::GetGeneratorDesc(in, sp)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CParticleSwooshDataFactory.hpp b/Runtime/Particle/CParticleSwooshDataFactory.hpp index e27fab23f..d6d4a88fc 100644 --- a/Runtime/Particle/CParticleSwooshDataFactory.hpp +++ b/Runtime/Particle/CParticleSwooshDataFactory.hpp @@ -8,7 +8,7 @@ #include "Runtime/IObj.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CSwooshDescription; class CSimplePool; class CParticleSwooshDataFactory { @@ -21,4 +21,4 @@ public: CFactoryFnReturn FParticleSwooshDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference*); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CProjectileWeaponDataFactory.cpp b/Runtime/Particle/CProjectileWeaponDataFactory.cpp index c234a8907..d02d0f5b6 100644 --- a/Runtime/Particle/CProjectileWeaponDataFactory.cpp +++ b/Runtime/Particle/CProjectileWeaponDataFactory.cpp @@ -9,8 +9,8 @@ #include "Runtime/Particle/CSwooshDescription.hpp" #include "Runtime/Particle/CWeaponDescription.hpp" -namespace urde { -static logvisor::Module Log("urde::CProjectileWeaponDataFactory"); +namespace metaforce { +static logvisor::Module Log("metaforce::CProjectileWeaponDataFactory"); using CPF = CParticleDataFactory; @@ -173,4 +173,4 @@ CFactoryFnReturn FProjectileWeaponDataFactory(const SObjectTag& tag, CInputStrea CSimplePool* sp = vparms.GetOwnedObj(); return TToken::GetIObjObjectFor(CProjectileWeaponDataFactory::GetGeneratorDesc(in, sp)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CProjectileWeaponDataFactory.hpp b/Runtime/Particle/CProjectileWeaponDataFactory.hpp index 4cd9bd9d2..1ec523057 100644 --- a/Runtime/Particle/CProjectileWeaponDataFactory.hpp +++ b/Runtime/Particle/CProjectileWeaponDataFactory.hpp @@ -8,7 +8,7 @@ #include "Runtime/IObj.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CSimplePool; class CWeaponDescription; @@ -22,4 +22,4 @@ public: CFactoryFnReturn FProjectileWeaponDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference*); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CRealElement.cpp b/Runtime/Particle/CRealElement.cpp index 2ae594de7..e42ddd4fc 100644 --- a/Runtime/Particle/CRealElement.cpp +++ b/Runtime/Particle/CRealElement.cpp @@ -10,7 +10,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Real_Elements */ -namespace urde { +namespace metaforce { CREKeyframeEmitter::CREKeyframeEmitter(CInputStream& in) { x4_percent = in.readUint32Big(); @@ -351,4 +351,4 @@ bool CREGetComponentAlpha::GetValue(int frame, float& valOut) const { return false; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CRealElement.hpp b/Runtime/Particle/CRealElement.hpp index 034bc8447..7db541d30 100644 --- a/Runtime/Particle/CRealElement.hpp +++ b/Runtime/Particle/CRealElement.hpp @@ -8,7 +8,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Real_Elements */ -namespace urde { +namespace metaforce { class CREKeyframeEmitter : public CRealElement { u32 x4_percent; @@ -357,4 +357,4 @@ public: bool GetValue(int frame, float& valOut) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CSpawnSystemKeyframeData.cpp b/Runtime/Particle/CSpawnSystemKeyframeData.cpp index ddd3e1503..4a039cc18 100644 --- a/Runtime/Particle/CSpawnSystemKeyframeData.cpp +++ b/Runtime/Particle/CSpawnSystemKeyframeData.cpp @@ -4,7 +4,7 @@ #include "Runtime/Graphics/CModel.hpp" #include "Runtime/Particle/CElectricDescription.hpp" -namespace urde { +namespace metaforce { CSpawnSystemKeyframeData::CSpawnSystemKeyframeData(CInputStream& in) { x0 = in.readUint32Big(); @@ -54,4 +54,4 @@ CSpawnSystemKeyframeData::GetSpawnedSystemsAtFrame(u32 frame) { return emptyReturn; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CSpawnSystemKeyframeData.hpp b/Runtime/Particle/CSpawnSystemKeyframeData.hpp index d254e14ad..b7b02bb18 100644 --- a/Runtime/Particle/CSpawnSystemKeyframeData.hpp +++ b/Runtime/Particle/CSpawnSystemKeyframeData.hpp @@ -7,7 +7,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CSimplePool; class CGenDescription; @@ -41,4 +41,4 @@ public: std::vector& GetSpawnedSystemsAtFrame(u32 frame); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CSwooshDescription.hpp b/Runtime/Particle/CSwooshDescription.hpp index 8910bebaf..ecd2ccae4 100644 --- a/Runtime/Particle/CSwooshDescription.hpp +++ b/Runtime/Particle/CSwooshDescription.hpp @@ -11,7 +11,7 @@ #include "Runtime/Particle/CUVElement.hpp" #include "Runtime/Particle/CVectorElement.hpp" -namespace urde { +namespace metaforce { class CSwooshDescription { public: std::unique_ptr x0_PSLT; @@ -45,4 +45,4 @@ public: CSwooshDescription() = default; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CUVElement.cpp b/Runtime/Particle/CUVElement.cpp index d364ac190..1bf85a527 100644 --- a/Runtime/Particle/CUVElement.cpp +++ b/Runtime/Particle/CUVElement.cpp @@ -2,7 +2,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#UV_Elements */ -namespace urde { +namespace metaforce { CUVEAnimTexture::CUVEAnimTexture(TToken&& tex, std::unique_ptr&& tileW, std::unique_ptr&& tileH, std::unique_ptr&& strideW, @@ -64,4 +64,4 @@ void CUVEAnimTexture::GetValueUV(int frame, SUVElementSet& valOut) const { valOut = x2c_uvElems[tile]; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CUVElement.hpp b/Runtime/Particle/CUVElement.hpp index bf7ea25eb..77162a2bb 100644 --- a/Runtime/Particle/CUVElement.hpp +++ b/Runtime/Particle/CUVElement.hpp @@ -10,7 +10,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#UV_Elements */ -namespace urde { +namespace metaforce { class CToken; struct SUVElementSet { @@ -58,4 +58,4 @@ public: bool HasConstantUV() const override { return false; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CVectorElement.cpp b/Runtime/Particle/CVectorElement.cpp index 3e910bd84..32afa1541 100644 --- a/Runtime/Particle/CVectorElement.cpp +++ b/Runtime/Particle/CVectorElement.cpp @@ -9,7 +9,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Vector_Elements */ -namespace urde { +namespace metaforce { CVEKeyframeEmitter::CVEKeyframeEmitter(CInputStream& in) { x4_percent = in.readUint32Big(); @@ -296,4 +296,4 @@ bool CVEColorToVector::GetValue(int frame, zeus::CVector3f& valOut) const { return false; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CVectorElement.hpp b/Runtime/Particle/CVectorElement.hpp index 940326a10..60f1443bf 100644 --- a/Runtime/Particle/CVectorElement.hpp +++ b/Runtime/Particle/CVectorElement.hpp @@ -10,7 +10,7 @@ /* Documentation at: https://wiki.axiodl.com/w/Particle_Script#Vector_Elements */ -namespace urde { +namespace metaforce { class CVEKeyframeEmitter : public CVectorElement { u32 x4_percent; @@ -209,4 +209,4 @@ public: bool GetValue(int frame, zeus::CVector3f& valOut) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CWarp.hpp b/Runtime/Particle/CWarp.hpp index cbb0d4a09..0bdc36ebc 100644 --- a/Runtime/Particle/CWarp.hpp +++ b/Runtime/Particle/CWarp.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Particle/CParticleGen.hpp" -namespace urde { +namespace metaforce { class CWarp { public: @@ -17,4 +17,4 @@ public: virtual FourCC Get4CharID() = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/CWeaponDescription.hpp b/Runtime/Particle/CWeaponDescription.hpp index 0144fe111..a1a95fd9b 100644 --- a/Runtime/Particle/CWeaponDescription.hpp +++ b/Runtime/Particle/CWeaponDescription.hpp @@ -10,7 +10,7 @@ #include "Runtime/Particle/CRealElement.hpp" #include "Runtime/Particle/CVectorElement.hpp" -namespace urde { +namespace metaforce { class CCollisionResponseData; struct SCollisionResponseData { @@ -59,4 +59,4 @@ public: bool x29_SPS2 = false; bool x29_FC60 = false; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Particle/IElement.hpp b/Runtime/Particle/IElement.hpp index e7cecd29a..9111f7b7c 100644 --- a/Runtime/Particle/IElement.hpp +++ b/Runtime/Particle/IElement.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class IElement { public: @@ -48,4 +48,4 @@ public: virtual bool GetValue(int frame, zeus::CVector3f& pPos, zeus::CVector3f& pVel) const = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/RetroTypes.cpp b/Runtime/RetroTypes.cpp index 3a94df7d5..3cb13e09a 100644 --- a/Runtime/RetroTypes.cpp +++ b/Runtime/RetroTypes.cpp @@ -5,8 +5,8 @@ #include -namespace urde { -logvisor::Module Log("urde::RetroTypes::CAssetId"); +namespace metaforce { +logvisor::Module Log("metaforce::RetroTypes::CAssetId"); CAssetId::CAssetId(CInputStream& in) { if (g_Main) { @@ -32,4 +32,4 @@ void CAssetId::PutTo(COutputStream& out) { Log.report(logvisor::Fatal, FMT_STRING("PutTo called before runtime Main entered!")); } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/RetroTypes.hpp b/Runtime/RetroTypes.hpp index a7bf1d1f0..460022263 100644 --- a/Runtime/RetroTypes.hpp +++ b/Runtime/RetroTypes.hpp @@ -22,7 +22,7 @@ using namespace std::literals; -namespace urde { +namespace metaforce { using FourCC = hecl::FourCC; @@ -151,7 +151,7 @@ public: return std::nullopt; } - return {urde::GetAverage(this->data(), this->size())}; + return {metaforce::GetAverage(this->data(), this->size())}; } [[nodiscard]] std::optional GetEntry(int i) const { @@ -166,24 +166,24 @@ public: [[nodiscard]] size_t Size() const { return this->size(); } }; -} // namespace urde +} // namespace metaforce namespace std { template <> -struct hash { - size_t operator()(const urde::SObjectTag& tag) const noexcept { return tag.id.Value(); } +struct hash { + size_t operator()(const metaforce::SObjectTag& tag) const noexcept { return tag.id.Value(); } }; template <> -struct hash { - size_t operator()(const urde::CAssetId& id) const noexcept { return id.Value(); } +struct hash { + size_t operator()(const metaforce::CAssetId& id) const noexcept { return id.Value(); } }; } // namespace std -FMT_CUSTOM_FORMATTER(urde::CAssetId, "{:08X}", obj.Value()) -FMT_CUSTOM_FORMATTER(urde::TEditorId, "{:08X}", obj.id) -FMT_CUSTOM_FORMATTER(urde::TUniqueId, "{:04X}", obj.id) -FMT_CUSTOM_FORMATTER(urde::SObjectTag, "{} {}", obj.type, obj.id) +FMT_CUSTOM_FORMATTER(metaforce::CAssetId, "{:08X}", obj.Value()) +FMT_CUSTOM_FORMATTER(metaforce::TEditorId, "{:08X}", obj.id) +FMT_CUSTOM_FORMATTER(metaforce::TUniqueId, "{:04X}", obj.id) +FMT_CUSTOM_FORMATTER(metaforce::SObjectTag, "{} {}", obj.type, obj.id) FMT_CUSTOM_FORMATTER(zeus::CVector3f, "({} {} {})", float(obj.x()), float(obj.y()), float(obj.z())) FMT_CUSTOM_FORMATTER(zeus::CVector2f, "({} {})", float(obj.x()), float(obj.y())) diff --git a/Runtime/Weapon/CAuxWeapon.cpp b/Runtime/Weapon/CAuxWeapon.cpp index 8e555c0cf..ce40ef2a6 100644 --- a/Runtime/Weapon/CAuxWeapon.cpp +++ b/Runtime/Weapon/CAuxWeapon.cpp @@ -8,7 +8,7 @@ #include "Runtime/Weapon/CNewFlameThrower.hpp" #include "Runtime/Weapon/CWaveBuster.hpp" -namespace urde { +namespace metaforce { constexpr CCameraShakeData skHardShake{ 0.3f, 100.f, @@ -342,4 +342,4 @@ void CAuxWeapon::SetNewTarget(TUniqueId targetId, CStateManager& mgr) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CAuxWeapon.hpp b/Runtime/Weapon/CAuxWeapon.hpp index bc48dc4ec..d6465f39c 100644 --- a/Runtime/Weapon/CAuxWeapon.hpp +++ b/Runtime/Weapon/CAuxWeapon.hpp @@ -9,7 +9,7 @@ #include "Runtime/Weapon/CGunWeapon.hpp" #include "Runtime/Weapon/CWeapon.hpp" -namespace urde { +namespace metaforce { class CAuxWeapon { TCachedToken x0_missile; @@ -52,4 +52,4 @@ public: void SetNewTarget(TUniqueId targetId, CStateManager& mgr); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CBeamInfo.hpp b/Runtime/Weapon/CBeamInfo.hpp index 8df00f49b..d800a489f 100644 --- a/Runtime/Weapon/CBeamInfo.hpp +++ b/Runtime/Weapon/CBeamInfo.hpp @@ -4,7 +4,7 @@ #include "Runtime/RetroTypes.hpp" #include -namespace urde { +namespace metaforce { class CBeamInfo { u32 x0_; /* @@ -89,4 +89,4 @@ public: const zeus::CColor& GetOuterColor() const { return x40_outerColor; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CBeamProjectile.cpp b/Runtime/Weapon/CBeamProjectile.cpp index fb19a22d4..ebdf04325 100644 --- a/Runtime/Weapon/CBeamProjectile.cpp +++ b/Runtime/Weapon/CBeamProjectile.cpp @@ -3,7 +3,7 @@ #include "Runtime/CStateManager.hpp" #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CBeamProjectile::CBeamProjectile(const TToken& wDesc, std::string_view name, EWeaponType wType, const zeus::CTransform& xf, s32 maxLength, float beamRadius, float travelSpeed, @@ -90,6 +90,6 @@ void CBeamProjectile::UpdateFx(const zeus::CTransform& xf, float dt, CStateManag x324_xf = xf; } -void CBeamProjectile::Accept(urde::IVisitor& visitor) { visitor.Visit(this); } +void CBeamProjectile::Accept(metaforce::IVisitor& visitor) { visitor.Visit(this); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CBeamProjectile.hpp b/Runtime/Weapon/CBeamProjectile.hpp index a0adc1290..9db00eaeb 100644 --- a/Runtime/Weapon/CBeamProjectile.hpp +++ b/Runtime/Weapon/CBeamProjectile.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CBeamProjectile : public CGameProjectile { public: enum class EDamageType { @@ -66,4 +66,4 @@ public: virtual void UpdateFx(const zeus::CTransform&, float, CStateManager&); virtual void Fire(const zeus::CTransform&, CStateManager&, bool) = 0; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CBomb.cpp b/Runtime/Weapon/CBomb.cpp index 525be1219..b5f8ec367 100644 --- a/Runtime/Weapon/CBomb.cpp +++ b/Runtime/Weapon/CBomb.cpp @@ -11,7 +11,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CBomb::CBomb(const TCachedToken& particle1, const TCachedToken& particle2, TUniqueId uid, TAreaId aid, TUniqueId playerId, float f1, const zeus::CTransform& xf, @@ -33,7 +33,7 @@ CBomb::CBomb(const TCachedToken& particle1, const TCachedToken< x184_particle2->SetGlobalTranslation(xf.origin); } -void CBomb::Accept(urde::IVisitor& visitor) { visitor.Visit(this); } +void CBomb::Accept(metaforce::IVisitor& visitor) { visitor.Visit(this); } void CBomb::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) { if (msg == EScriptObjectMessage::Registered) { @@ -63,7 +63,7 @@ void CBomb::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManag constexpr CMaterialFilter kSolidFilter = CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {EMaterialTypes::Character, EMaterialTypes::Player, EMaterialTypes::ProjectilePassthrough}); -void CBomb::Think(float dt, urde::CStateManager& mgr) { +void CBomb::Think(float dt, metaforce::CStateManager& mgr) { CWeapon::Think(dt, mgr); if (x190_24_isNotDetonated) { @@ -125,7 +125,7 @@ void CBomb::AddToRenderer(const zeus::CFrustum& frustum, CStateManager& mgr) { g_Renderer->AddParticleGen(*x184_particle2, closestPoint, aabox); } -void CBomb::Touch(CActor&, urde::CStateManager&) { +void CBomb::Touch(CActor&, metaforce::CStateManager&) { #if 0 x190_24_isNotDetonated; /* wat? */ #endif @@ -160,4 +160,4 @@ void CBomb::UpdateLight(float dt, CStateManager& mgr) { light->SetLight(x184_particle2->GetLight()); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CBomb.hpp b/Runtime/Weapon/CBomb.hpp index 3f89e6c7a..ebaaf91d5 100644 --- a/Runtime/Weapon/CBomb.hpp +++ b/Runtime/Weapon/CBomb.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CElementGen; class CBomb : public CWeapon { @@ -46,4 +46,4 @@ public: bool IsBeingDragged() const { return x190_25_beingDragged; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CBurstFire.cpp b/Runtime/Weapon/CBurstFire.cpp index 013f48a1c..c315fab5b 100644 --- a/Runtime/Weapon/CBurstFire.cpp +++ b/Runtime/Weapon/CBurstFire.cpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { CBurstFire::CBurstFire(const SBurst* const* burstDefs, s32 firstBurstCount) : x10_firstBurstCounter(firstBurstCount) { while (*burstDefs) { x1c_burstDefs.push_back(*burstDefs); @@ -96,4 +96,4 @@ float CBurstFire::GetMaxXError() const { return g_tweakPlayer->GetPlayerXYHalfEx float CBurstFire::GetMaxZError() const { return g_tweakPlayer->GetEyeOffset(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CBurstFire.hpp b/Runtime/Weapon/CBurstFire.hpp index d00f2ec3d..2ee8baa79 100644 --- a/Runtime/Weapon/CBurstFire.hpp +++ b/Runtime/Weapon/CBurstFire.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { class CStateManager; struct SBurst { @@ -47,4 +47,4 @@ public: bool ShouldFire() const { return x14_24_shouldFire; } bool IsBurstSet() const { return x18_curBursts != nullptr; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CElectricBeamProjectile.cpp b/Runtime/Weapon/CElectricBeamProjectile.cpp index 9b420bdc0..9328e7b82 100644 --- a/Runtime/Weapon/CElectricBeamProjectile.cpp +++ b/Runtime/Weapon/CElectricBeamProjectile.cpp @@ -10,7 +10,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CElectricBeamProjectile::CElectricBeamProjectile(const TToken& wDesc, EWeaponType wType, const SElectricBeamInfo& elec, const zeus::CTransform& xf, EMaterialTypes matTypes, const CDamageInfo& dInfo, TUniqueId uid, @@ -109,4 +109,4 @@ void CElectricBeamProjectile::Fire(const zeus::CTransform&, CStateManager&, bool SetActive(true); x480_ = 0.f; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CElectricBeamProjectile.hpp b/Runtime/Weapon/CElectricBeamProjectile.hpp index ce537d816..6f19545ec 100644 --- a/Runtime/Weapon/CElectricBeamProjectile.hpp +++ b/Runtime/Weapon/CElectricBeamProjectile.hpp @@ -4,7 +4,7 @@ #include "Runtime/Weapon/CBeamProjectile.hpp" -namespace urde { +namespace metaforce { struct SElectricBeamInfo { TToken x0_electricDescription; float x8_maxLength; @@ -38,4 +38,4 @@ public: void ResetBeam(CStateManager&, bool) override; void Fire(const zeus::CTransform&, CStateManager&, bool) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CEnergyProjectile.cpp b/Runtime/Weapon/CEnergyProjectile.cpp index f76ae75aa..485ab1a09 100644 --- a/Runtime/Weapon/CEnergyProjectile.cpp +++ b/Runtime/Weapon/CEnergyProjectile.cpp @@ -14,7 +14,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CEnergyProjectile::CEnergyProjectile(bool active, const TToken& desc, EWeaponType type, const zeus::CTransform& xf, EMaterialTypes excludeMat, const CDamageInfo& damage, @@ -406,4 +406,4 @@ void CEnergyProjectile::StopProjectile(CStateManager& mgr) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CEnergyProjectile.hpp b/Runtime/Weapon/CEnergyProjectile.hpp index 31371aa48..6b58d3db4 100644 --- a/Runtime/Weapon/CEnergyProjectile.hpp +++ b/Runtime/Weapon/CEnergyProjectile.hpp @@ -3,7 +3,7 @@ #include "CGameProjectile.hpp" #include "Camera/CCameraShakeData.hpp" -namespace urde { +namespace metaforce { class CEnergyProjectile : public CGameProjectile { CSfxHandle x2e8_sfx; @@ -42,4 +42,4 @@ public: void Set3d0_26(bool v) { x3d0_26_ = v; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CFidget.cpp b/Runtime/Weapon/CFidget.cpp index b393e8f27..b842f1ab1 100644 --- a/Runtime/Weapon/CFidget.cpp +++ b/Runtime/Weapon/CFidget.cpp @@ -3,7 +3,7 @@ #include "Runtime/CStateManager.hpp" #include "Runtime/World/CPlayer.hpp" -namespace urde { +namespace metaforce { static float kMinorFidgetDelay = 20.f; static float kMajorFidgetDelay = 20.f; @@ -136,4 +136,4 @@ void CFidget::ResetAll() { x34_24_loading = false; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CFidget.hpp b/Runtime/Weapon/CFidget.hpp index 5158221b4..4728651db 100644 --- a/Runtime/Weapon/CFidget.hpp +++ b/Runtime/Weapon/CFidget.hpp @@ -3,7 +3,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Weapon/CGunMotion.hpp" -namespace urde { +namespace metaforce { class CStateManager; class CFidget { @@ -46,4 +46,4 @@ public: void DoneLoading() { x34_24_loading = false; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CFlameInfo.cpp b/Runtime/Weapon/CFlameInfo.cpp index b9a30ff0a..ff6ccd3ec 100644 --- a/Runtime/Weapon/CFlameInfo.cpp +++ b/Runtime/Weapon/CFlameInfo.cpp @@ -1,6 +1,6 @@ #include "Runtime/Weapon/CFlameInfo.hpp" -namespace urde { +namespace metaforce { CFlameInfo::CFlameInfo(s32 w1, s32 w2, CAssetId flameFxId, s32 w3, float f1, float f2, float f3) : x0_propertyCount(w1), x4_attributes(w2), x8_flameFxId(flameFxId), xc_length(w3), x10_(f1), x18_(f2), x1c_(f3) {} @@ -13,4 +13,4 @@ CFlameInfo::CFlameInfo(CInputStream& in) , x10_(in.readFloatBig()) , x18_(in.readFloatBig()) , x1c_(in.readFloatBig()) {} -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CFlameInfo.hpp b/Runtime/Weapon/CFlameInfo.hpp index 134da9143..3606f0e43 100644 --- a/Runtime/Weapon/CFlameInfo.hpp +++ b/Runtime/Weapon/CFlameInfo.hpp @@ -3,7 +3,7 @@ #include "Runtime/Weapon/CGameProjectile.hpp" #include "Runtime/IOStreams.hpp" -namespace urde { +namespace metaforce { class CFlameInfo { friend class CFlameThrower; s32 x0_propertyCount; @@ -23,4 +23,4 @@ public: [[nodiscard]] s32 GetLength() const { return xc_length; } [[nodiscard]] CAssetId GetFlameFxId() const { return x8_flameFxId; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CFlameThrower.cpp b/Runtime/Weapon/CFlameThrower.cpp index 80692d028..7b59a14a6 100644 --- a/Runtime/Weapon/CFlameThrower.cpp +++ b/Runtime/Weapon/CFlameThrower.cpp @@ -13,7 +13,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { const zeus::CVector3f CFlameThrower::kLightOffset(0, 3.f, 2.f); CFlameThrower::CFlameThrower(const TToken& wDesc, std::string_view name, EWeaponType wType, @@ -249,4 +249,4 @@ void CFlameThrower::Think(float dt, CStateManager& mgr) { } } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CFlameThrower.hpp b/Runtime/Weapon/CFlameThrower.hpp index e1eab06c7..aa7d307a6 100644 --- a/Runtime/Weapon/CFlameThrower.hpp +++ b/Runtime/Weapon/CFlameThrower.hpp @@ -5,7 +5,7 @@ #include "Runtime/Particle/CFlameWarp.hpp" #include "Runtime/Weapon/CGameProjectile.hpp" -namespace urde { +namespace metaforce { class CFlameInfo; class CElementGen; class CFlameThrower : public CGameProjectile { @@ -59,4 +59,4 @@ public: void Fire(const zeus::CTransform&, CStateManager&, bool); bool GetParticlesActive() const { return x400_25_particlesActive; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGSComboFire.cpp b/Runtime/Weapon/CGSComboFire.cpp index cf1a46e24..cf724c772 100644 --- a/Runtime/Weapon/CGSComboFire.cpp +++ b/Runtime/Weapon/CGSComboFire.cpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CAnimData.hpp" #include "Runtime/Character/CPASAnimParmData.hpp" -namespace urde { +namespace metaforce { bool CGSComboFire::Update(CAnimData& data, float dt, CStateManager& mgr) { if (x8_cueAnimId != -1) { @@ -63,4 +63,4 @@ s32 CGSComboFire::SetAnim(CAnimData& data, s32 gunId, s32 loopState, CStateManag return anim.second; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGSComboFire.hpp b/Runtime/Weapon/CGSComboFire.hpp index 622f97135..ade08e076 100644 --- a/Runtime/Weapon/CGSComboFire.hpp +++ b/Runtime/Weapon/CGSComboFire.hpp @@ -2,7 +2,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CAnimData; class CStateManager; @@ -26,4 +26,4 @@ public: s32 SetAnim(CAnimData& data, s32 gunId, s32 loopState, CStateManager& mgr, float delay); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGSFidget.cpp b/Runtime/Weapon/CGSFidget.cpp index dca5f0e57..667ca7e5e 100644 --- a/Runtime/Weapon/CGSFidget.cpp +++ b/Runtime/Weapon/CGSFidget.cpp @@ -5,7 +5,7 @@ #include "Runtime/Character/CAnimData.hpp" #include "Runtime/Weapon/WeaponCommon.hpp" -namespace urde { +namespace metaforce { bool CGSFidget::Update(CAnimData& data, float dt, CStateManager& mgr) { return !data.IsAnimTimeRemaining(0.001f, "Whole Body"); } @@ -38,4 +38,4 @@ void CGSFidget::LoadAnimAsync(CAnimData& data, s32 type, s32 gunId, s32 animSet, void CGSFidget::UnLoadAnim() { x0_anims.clear(); } bool CGSFidget::IsAnimLoaded() const { return NWeaponTypes::are_tokens_ready(x0_anims); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGSFidget.hpp b/Runtime/Weapon/CGSFidget.hpp index 1317089be..d5fd7f45d 100644 --- a/Runtime/Weapon/CGSFidget.hpp +++ b/Runtime/Weapon/CGSFidget.hpp @@ -5,7 +5,7 @@ #include "Runtime/CToken.hpp" #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CAnimData; class CStateManager; class CGSFidget { @@ -22,4 +22,4 @@ public: bool IsAnimLoaded() const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGSFreeLook.cpp b/Runtime/Weapon/CGSFreeLook.cpp index 749b2f8a6..df4209fcd 100644 --- a/Runtime/Weapon/CGSFreeLook.cpp +++ b/Runtime/Weapon/CGSFreeLook.cpp @@ -3,7 +3,7 @@ #include "Runtime/CStateManager.hpp" #include "Runtime/Character/CPASAnimParmData.hpp" -namespace urde { +namespace metaforce { bool CGSFreeLook::Update(CAnimData& data, float dt, CStateManager& mgr) { if (x4_cueAnimId != -1) { @@ -53,4 +53,4 @@ s32 CGSFreeLook::SetAnim(CAnimData& data, s32 gunId, s32 setId, s32 loopState, C return anim.second; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGSFreeLook.hpp b/Runtime/Weapon/CGSFreeLook.hpp index b7e53d8ef..2e2f090ea 100644 --- a/Runtime/Weapon/CGSFreeLook.hpp +++ b/Runtime/Weapon/CGSFreeLook.hpp @@ -2,7 +2,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CAnimData; class CStateManager; @@ -24,4 +24,4 @@ public: s32 SetAnim(CAnimData& data, s32 gunId, s32 setId, s32 loopState, CStateManager& mgr, float delay); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGameProjectile.cpp b/Runtime/Weapon/CGameProjectile.cpp index 46a7f0a13..2c90279e8 100644 --- a/Runtime/Weapon/CGameProjectile.cpp +++ b/Runtime/Weapon/CGameProjectile.cpp @@ -15,7 +15,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CGameProjectile::CGameProjectile(bool active, const TToken& wDesc, std::string_view name, EWeaponType wType, const zeus::CTransform& xf, EMaterialTypes excludeMat, const CDamageInfo& dInfo, TUniqueId uid, TAreaId aid, TUniqueId owner, @@ -43,7 +43,7 @@ CGameProjectile::CGameProjectile(bool active, const TToken& , x2e4_27_inWater(underwater) , x2e4_28_sendProjectileCollideMsg(sendCollideMsg) {} -void CGameProjectile::Accept(urde::IVisitor& visitor) { visitor.Visit(this); } +void CGameProjectile::Accept(metaforce::IVisitor& visitor) { visitor.Visit(this); } void CGameProjectile::ResolveCollisionWithActor(const CRayCastResult& res, CActor& act, CStateManager& mgr) { const zeus::CVector3f revDir = -x34_transform.basis[1].normalized(); @@ -459,4 +459,4 @@ std::optional CGameProjectile::GetTouchBounds() const { return std::nullopt; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGameProjectile.hpp b/Runtime/Weapon/CGameProjectile.hpp index a75ede1a3..39a933995 100644 --- a/Runtime/Weapon/CGameProjectile.hpp +++ b/Runtime/Weapon/CGameProjectile.hpp @@ -15,7 +15,7 @@ #include #include -namespace urde { +namespace metaforce { class CGenDescription; class CWeaponDescription; @@ -90,4 +90,4 @@ public: void SetMinHomingDistance(float dist) { x2e0_minHomingDist = dist; } void SetHitProjectileOwner(TUniqueId id) { x2c4_hitProjectileOwner = id; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGrappleArm.cpp b/Runtime/Weapon/CGrappleArm.cpp index d67f6117c..38203a449 100644 --- a/Runtime/Weapon/CGrappleArm.cpp +++ b/Runtime/Weapon/CGrappleArm.cpp @@ -13,7 +13,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { float CGrappleArm::g_GrappleBeamAnglePhaseDelta = 0.875f; float CGrappleArm::g_GrappleBeamXWaveAmplitude = 0.25f; @@ -614,4 +614,4 @@ void CGrappleArm::ReturnToDefault(CStateManager& mgr, float dt, bool setState) { x328_gunController->ReturnToDefault(mgr, dt, setState); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGrappleArm.hpp b/Runtime/Weapon/CGrappleArm.hpp index 9d287073f..a8546e8cb 100644 --- a/Runtime/Weapon/CGrappleArm.hpp +++ b/Runtime/Weapon/CGrappleArm.hpp @@ -14,7 +14,7 @@ #include -namespace urde { +namespace metaforce { class CActorLights; class CStateManager; struct CModelFlags; @@ -137,4 +137,4 @@ public: const CGunController* GunController() const { return x328_gunController.get(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGunController.cpp b/Runtime/Weapon/CGunController.cpp index 1c8fb9028..d08a758d7 100644 --- a/Runtime/Weapon/CGunController.cpp +++ b/Runtime/Weapon/CGunController.cpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CCharLayoutInfo.hpp" #include "Runtime/Character/CPASAnimParmData.hpp" -namespace urde { +namespace metaforce { void CGunController::LoadFidgetAnimAsync(CStateManager& mgr, s32 type, s32 gunId, s32 animSet) { x30_fidget.LoadAnimAsync(*x0_modelData.GetAnimationData(), type, gunId, animSet, mgr); @@ -176,4 +176,4 @@ void CGunController::Reset() { x58_25_enteredComboFire = false; x50_gunState = EGunState::Inactive; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGunController.hpp b/Runtime/Weapon/CGunController.hpp index 0698a4551..c98da0afe 100644 --- a/Runtime/Weapon/CGunController.hpp +++ b/Runtime/Weapon/CGunController.hpp @@ -5,7 +5,7 @@ #include "Runtime/Weapon/CGSFidget.hpp" #include "Runtime/Weapon/CGSFreeLook.hpp" -namespace urde { +namespace metaforce { enum class EGunState { Inactive, Default, FreeLook, ComboFire, Idle, Fidget, Strike, BigStrike }; class CGunController { @@ -37,4 +37,4 @@ public: void Reset(); s32 GetCurAnimId() const { return x54_curAnimId; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGunMotion.cpp b/Runtime/Weapon/CGunMotion.cpp index 14bccc5bd..e4d205930 100644 --- a/Runtime/Weapon/CGunMotion.cpp +++ b/Runtime/Weapon/CGunMotion.cpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CPASAnimParmData.hpp" #include "Runtime/Weapon/WeaponCommon.hpp" -namespace urde { +namespace metaforce { CGunMotion::CGunMotion(CAssetId ancsId, const zeus::CVector3f& scale) : x0_modelData(CAnimRes(ancsId, 0, scale, 0, false), 1), x4c_gunController(x0_modelData) { @@ -86,4 +86,4 @@ void CGunMotion::Draw(const CStateManager& mgr, const zeus::CTransform& xf) { x0_modelData.Render(mgr, xf, nullptr, flags); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGunMotion.hpp b/Runtime/Weapon/CGunMotion.hpp index 64cd18341..f226e6b65 100644 --- a/Runtime/Weapon/CGunMotion.hpp +++ b/Runtime/Weapon/CGunMotion.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { namespace SamusGun { enum class EAnimationState { Wander, Fidget, Struck, FreeLook, ComboFire, Idle, BasePosition }; @@ -37,4 +37,4 @@ public: bool IsAnimPlaying() const { return xb8_24_animPlaying; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGunWeapon.cpp b/Runtime/Weapon/CGunWeapon.cpp index b396acd6a..4f2e3b9d9 100644 --- a/Runtime/Weapon/CGunWeapon.cpp +++ b/Runtime/Weapon/CGunWeapon.cpp @@ -12,7 +12,7 @@ #include "Runtime/Weapon/CEnergyProjectile.hpp" #include "Runtime/Weapon/CWeapon.hpp" -namespace urde { +namespace metaforce { namespace { constexpr std::array skBeamXferNames{ "PowerXfer", "IceXfer", "WaveXfer", "PlasmaXfer", "PhazonXfer", @@ -591,4 +591,4 @@ bool CGunWeapon::IsChargeAnimOver() const { return !(x218_25_enableCharge && x10_solidModelData->GetAnimationData()->IsAnimTimeRemaining(0.001f, "Whole Body")); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CGunWeapon.hpp b/Runtime/Weapon/CGunWeapon.hpp index 6b2ef42cd..39ab12f20 100644 --- a/Runtime/Weapon/CGunWeapon.hpp +++ b/Runtime/Weapon/CGunWeapon.hpp @@ -22,7 +22,7 @@ #include -namespace urde { +namespace metaforce { class CActorLights; struct CModelFlags; @@ -160,4 +160,4 @@ public: static CDamageInfo GetShotDamageInfo(const SShotParam& shotParam, CStateManager& mgr); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CIceBeam.cpp b/Runtime/Weapon/CIceBeam.cpp index a22c9db03..819ad2e15 100644 --- a/Runtime/Weapon/CIceBeam.cpp +++ b/Runtime/Weapon/CIceBeam.cpp @@ -5,7 +5,7 @@ #include "Runtime/CSimplePool.hpp" #include "Runtime/GameGlobalObjects.hpp" -namespace urde { +namespace metaforce { CIceBeam::CIceBeam(CAssetId characterId, EWeaponType type, TUniqueId playerId, EMaterialTypes playerMaterial, const zeus::CVector3f& scale) @@ -141,4 +141,4 @@ void CIceBeam::Unload(CStateManager& mgr) { bool CIceBeam::IsLoaded() const { return CGunWeapon::IsLoaded() && x248_24_loaded; } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/Weapon/CIceBeam.hpp b/Runtime/Weapon/CIceBeam.hpp index e28c85544..b8d5b530a 100644 --- a/Runtime/Weapon/CIceBeam.hpp +++ b/Runtime/Weapon/CIceBeam.hpp @@ -4,7 +4,7 @@ #include "Runtime/Weapon/CGunWeapon.hpp" -namespace urde { +namespace metaforce { class CIceBeam final : public CGunWeapon { TCachedToken x21c_iceSmoke; @@ -33,4 +33,4 @@ public: bool IsLoaded() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CNewFlameThrower.cpp b/Runtime/Weapon/CNewFlameThrower.cpp index 8a34ae858..aa840b244 100644 --- a/Runtime/Weapon/CNewFlameThrower.cpp +++ b/Runtime/Weapon/CNewFlameThrower.cpp @@ -20,7 +20,7 @@ #include "Runtime/World/CScriptTrigger.hpp" #include "Runtime/Graphics/CBooRenderer.hpp" -namespace urde { +namespace metaforce { namespace { constexpr CMaterialFilter skExcludeProjectilePassthrough = CMaterialFilter::MakeExclude(EMaterialTypes::ProjectilePassthrough); @@ -790,4 +790,4 @@ void CNewFlameThrower::SetWorldLighting(CStateManager& mgr, TAreaId area, float } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CNewFlameThrower.hpp b/Runtime/Weapon/CNewFlameThrower.hpp index ca01a9ab6..e42ef89d2 100644 --- a/Runtime/Weapon/CNewFlameThrower.hpp +++ b/Runtime/Weapon/CNewFlameThrower.hpp @@ -11,7 +11,7 @@ #include "Runtime/rstl.hpp" #include "Runtime/Weapon/CGameProjectile.hpp" -namespace urde { +namespace metaforce { class CCollisionPrimitive; class CCollisionInfoList; class CCollisionInfo; @@ -116,4 +116,4 @@ public: void AddToRenderer(zeus::CFrustum const& planes, CStateManager& mgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CPhazonBeam.cpp b/Runtime/Weapon/CPhazonBeam.cpp index cea934fea..aa5f8f4e2 100644 --- a/Runtime/Weapon/CPhazonBeam.cpp +++ b/Runtime/Weapon/CPhazonBeam.cpp @@ -9,7 +9,7 @@ #include "Runtime/World/CPlayer.hpp" #include "Runtime/World/CWorld.hpp" -namespace urde { +namespace metaforce { CPhazonBeam::CPhazonBeam(CAssetId characterId, EWeaponType type, TUniqueId playerId, EMaterialTypes playerMaterial, const zeus::CVector3f& scale) @@ -216,4 +216,4 @@ void CPhazonBeam::DrawMuzzleFx(const CStateManager& mgr) const { CGunWeapon::DrawMuzzleFx(mgr); } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/Weapon/CPhazonBeam.hpp b/Runtime/Weapon/CPhazonBeam.hpp index 2f4c36b36..3b1318457 100644 --- a/Runtime/Weapon/CPhazonBeam.hpp +++ b/Runtime/Weapon/CPhazonBeam.hpp @@ -5,7 +5,7 @@ #include "Runtime/Graphics/Shaders/CAABoxShader.hpp" #include "Runtime/Weapon/CGunWeapon.hpp" -namespace urde { +namespace metaforce { class CPhazonBeam final : public CGunWeapon { TCachedToken x21c_phazonVeins; @@ -53,4 +53,4 @@ public: void DrawMuzzleFx(const CStateManager& mgr) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CPlasmaBeam.cpp b/Runtime/Weapon/CPlasmaBeam.cpp index 4e692117d..6f6d60797 100644 --- a/Runtime/Weapon/CPlasmaBeam.cpp +++ b/Runtime/Weapon/CPlasmaBeam.cpp @@ -7,7 +7,7 @@ #include "Runtime/World/CPlayer.hpp" #include "Runtime/World/CWorld.hpp" -namespace urde { +namespace metaforce { namespace { constexpr CCameraShakeData CameraShaker{0.125f, 0.25f}; constexpr std::array kSoundId{SFXwpn_fire_plasma_normal, SFXwpn_fire_plasma_charged}; @@ -146,4 +146,4 @@ void CPlasmaBeam::Unload(CStateManager& mgr) { bool CPlasmaBeam::IsLoaded() const { return CGunWeapon::IsLoaded() && x22c_24_loaded; } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/Weapon/CPlasmaBeam.hpp b/Runtime/Weapon/CPlasmaBeam.hpp index 21fc9956a..3ec1bb2d1 100644 --- a/Runtime/Weapon/CPlasmaBeam.hpp +++ b/Runtime/Weapon/CPlasmaBeam.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/Weapon/CGunWeapon.hpp" -namespace urde { +namespace metaforce { class CPlasmaBeam final : public CGunWeapon { TCachedToken x21c_plasma2nd1; @@ -42,4 +42,4 @@ public: bool IsLoaded() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CPlasmaProjectile.cpp b/Runtime/Weapon/CPlasmaProjectile.cpp index 26be2fd60..9a9d57abd 100644 --- a/Runtime/Weapon/CPlasmaProjectile.cpp +++ b/Runtime/Weapon/CPlasmaProjectile.cpp @@ -10,7 +10,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CPlasmaProjectile::RenderObjects::RenderObjects(boo::IGraphicsDataFactory::Context& ctx, boo::ObjToken tex, @@ -444,4 +444,4 @@ void CPlasmaProjectile::Render(CStateManager& mgr) { (flags & 0x10) ? m_renderObjs->m_beamStrip4Sub : m_renderObjs->m_beamStrip4); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CPlasmaProjectile.hpp b/Runtime/Weapon/CPlasmaProjectile.hpp index d4e91a5d4..2b9c60999 100644 --- a/Runtime/Weapon/CPlasmaProjectile.hpp +++ b/Runtime/Weapon/CPlasmaProjectile.hpp @@ -15,7 +15,7 @@ #include -namespace urde { +namespace metaforce { class CPlasmaProjectile : public CBeamProjectile { public: struct PlayerEffectResources : rstl::reserved_vector { @@ -134,4 +134,4 @@ public: zeus::CColor GetOuterColor() const { return x494_outerColor; } bool IsFiring() const { return x548_26_firing; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CPlayerGun.cpp b/Runtime/Weapon/CPlayerGun.cpp index 2b2f6c84f..02415b95f 100644 --- a/Runtime/Weapon/CPlayerGun.cpp +++ b/Runtime/Weapon/CPlayerGun.cpp @@ -15,7 +15,7 @@ #include "Runtime/Weapon/CEnergyProjectile.hpp" #include "Runtime/Weapon/CPowerBomb.hpp" -namespace urde { +namespace metaforce { namespace { std::array kVerticalAngleTable{-30.f, 0.f, 30.f}; std::array kHorizontalAngleTable{30.f, 30.f, 30.f}; @@ -2294,4 +2294,4 @@ TUniqueId CPlayerGun::DropPowerBomb(CStateManager& mgr) { mgr.AddObject(*pBomb); return uid; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CPlayerGun.hpp b/Runtime/Weapon/CPlayerGun.hpp index ed13e1d80..d04f755fe 100644 --- a/Runtime/Weapon/CPlayerGun.hpp +++ b/Runtime/Weapon/CPlayerGun.hpp @@ -29,7 +29,7 @@ #include #include -namespace urde { +namespace metaforce { struct CFinalInput; class CPlayerGun { @@ -357,4 +357,4 @@ public: CAuxWeapon& GetAuxWeapon() const { return *x744_auxWeapon; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CPowerBeam.cpp b/Runtime/Weapon/CPowerBeam.cpp index 21bcfa596..a42e64a0a 100644 --- a/Runtime/Weapon/CPowerBeam.cpp +++ b/Runtime/Weapon/CPowerBeam.cpp @@ -5,7 +5,7 @@ #include "Runtime/CSimplePool.hpp" #include "Runtime/GameGlobalObjects.hpp" -namespace urde { +namespace metaforce { CPowerBeam::CPowerBeam(CAssetId characterId, EWeaponType type, TUniqueId playerId, EMaterialTypes playerMaterial, const zeus::CVector3f& scale) @@ -137,4 +137,4 @@ void CPowerBeam::Unload(CStateManager& mgr) { bool CPowerBeam::IsLoaded() const { return CGunWeapon::IsLoaded() && x244_25_loaded; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CPowerBeam.hpp b/Runtime/Weapon/CPowerBeam.hpp index d031ec676..71776e8f0 100644 --- a/Runtime/Weapon/CPowerBeam.hpp +++ b/Runtime/Weapon/CPowerBeam.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/Weapon/CGunWeapon.hpp" -namespace urde { +namespace metaforce { class CPowerBeam final : public CGunWeapon { enum class ESmokeState { Inactive, Active, Done }; @@ -33,4 +33,4 @@ public: bool IsLoaded() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CPowerBomb.cpp b/Runtime/Weapon/CPowerBomb.cpp index 1b43075ab..dce9c62e1 100644 --- a/Runtime/Weapon/CPowerBomb.cpp +++ b/Runtime/Weapon/CPowerBomb.cpp @@ -14,7 +14,7 @@ #include -namespace urde { +namespace metaforce { constexpr zeus::CColor kFadeColor(COLOR(0xffffff7)); CPowerBomb::CPowerBomb(const TToken& particle, TUniqueId uid, TAreaId aid, TUniqueId playerId, @@ -93,8 +93,8 @@ void CPowerBomb::AddToRenderer(const zeus::CFrustum&, CStateManager&) { g_Renderer->AddParticleGen(*x168_particle); } -void CPowerBomb::ApplyDynamicDamage(const zeus::CVector3f& pos, urde::CStateManager& mgr) { +void CPowerBomb::ApplyDynamicDamage(const zeus::CVector3f& pos, metaforce::CStateManager& mgr) { mgr.ApplyDamageToWorld(xec_ownerId, *this, pos, x12c_curDamageInfo, xf8_filter); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CPowerBomb.hpp b/Runtime/Weapon/CPowerBomb.hpp index a69cc9a90..405cbf80c 100644 --- a/Runtime/Weapon/CPowerBomb.hpp +++ b/Runtime/Weapon/CPowerBomb.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CElementGen; class CPowerBomb : public CWeapon { @@ -36,4 +36,4 @@ public: void ApplyDynamicDamage(const zeus::CVector3f&, CStateManager&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CProjectileInfo.cpp b/Runtime/Weapon/CProjectileInfo.cpp index a876b6d10..140cbc4cb 100644 --- a/Runtime/Weapon/CProjectileInfo.cpp +++ b/Runtime/Weapon/CProjectileInfo.cpp @@ -7,9 +7,9 @@ #include "Runtime/World/CDamageInfo.hpp" #include "Runtime/World/CPlayer.hpp" -namespace urde { +namespace metaforce { -CProjectileInfo::CProjectileInfo(urde::CInputStream& in) +CProjectileInfo::CProjectileInfo(metaforce::CInputStream& in) : x0_weaponDescription(g_SimplePool->GetObj({SBIG('WPSC'), CAssetId(in)})), xc_damageInfo(in) {} CProjectileInfo::CProjectileInfo(CAssetId proj, const CDamageInfo& dInfo) @@ -74,4 +74,4 @@ zeus::CVector3f CProjectileInfo::PredictInterceptPos(const zeus::CVector3f& gunP return PredictInterceptPos(gunPos, aimPos, player, gravity, GetProjectileSpeed(), dt); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CProjectileInfo.hpp b/Runtime/Weapon/CProjectileInfo.hpp index 7f388c359..8ef453c87 100644 --- a/Runtime/Weapon/CProjectileInfo.hpp +++ b/Runtime/Weapon/CProjectileInfo.hpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { class CPlayer; class CProjectileInfo { TCachedToken x0_weaponDescription; @@ -26,4 +26,4 @@ public: void SetDamage(const CDamageInfo& damageInfo) { xc_damageInfo = damageInfo; } TCachedToken& Token() { return x0_weaponDescription; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CProjectileWeapon.cpp b/Runtime/Weapon/CProjectileWeapon.cpp index d50a92903..bbe62ec50 100644 --- a/Runtime/Weapon/CProjectileWeapon.cpp +++ b/Runtime/Weapon/CProjectileWeapon.cpp @@ -5,7 +5,7 @@ #include "Runtime/Graphics/CModel.hpp" #include "Runtime/Particle/CParticleGlobals.hpp" -namespace urde { +namespace metaforce { u16 CProjectileWeapon::g_GlobalSeed = 99; @@ -438,4 +438,4 @@ void CProjectileWeapon::Update(float dt) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CProjectileWeapon.hpp b/Runtime/Weapon/CProjectileWeapon.hpp index 34613ba9e..10be49cd9 100644 --- a/Runtime/Weapon/CProjectileWeapon.hpp +++ b/Runtime/Weapon/CProjectileWeapon.hpp @@ -18,7 +18,7 @@ #include #include -namespace urde { +namespace metaforce { class CDecalDescription; class CGenDescription; class CModel; @@ -101,4 +101,4 @@ public: double GameTime() const { return xd0_curTime; } static constexpr float GetTickPeriod() { return 0.0166667f; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CTargetableProjectile.cpp b/Runtime/Weapon/CTargetableProjectile.cpp index ce6b6e748..1d36b4d55 100644 --- a/Runtime/Weapon/CTargetableProjectile.cpp +++ b/Runtime/Weapon/CTargetableProjectile.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CTargetableProjectile::CTargetableProjectile( const TToken& desc, EWeaponType type, const zeus::CTransform& xf, EMaterialTypes materials, @@ -61,4 +61,4 @@ void CTargetableProjectile::ResolveCollisionWithActor(const CRayCastResult& res, CEnergyProjectile::ResolveCollisionWithActor(res, act, mgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CTargetableProjectile.hpp b/Runtime/Weapon/CTargetableProjectile.hpp index bbe9a862f..7f0c3fbb2 100644 --- a/Runtime/Weapon/CTargetableProjectile.hpp +++ b/Runtime/Weapon/CTargetableProjectile.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Weapon/CEnergyProjectile.hpp" -namespace urde { +namespace metaforce { class CTargetableProjectile : public CEnergyProjectile { TLockedToken x3d8_weaponDesc; @@ -26,4 +26,4 @@ public: void ResolveCollisionWithActor(const CRayCastResult& res, CActor& act, CStateManager& mgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CWaveBeam.cpp b/Runtime/Weapon/CWaveBeam.cpp index 1641a8e64..a5ec16f65 100644 --- a/Runtime/Weapon/CWaveBeam.cpp +++ b/Runtime/Weapon/CWaveBeam.cpp @@ -6,7 +6,7 @@ #include "Runtime/GameGlobalObjects.hpp" #include "Runtime/Weapon/CEnergyProjectile.hpp" -namespace urde { +namespace metaforce { namespace { constexpr float skShotAnglePitch = 120.f; @@ -165,4 +165,4 @@ void CWaveBeam::Unload(CStateManager& mgr) { bool CWaveBeam::IsLoaded() const { return CGunWeapon::IsLoaded() && x258_24_loaded; } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/Weapon/CWaveBeam.hpp b/Runtime/Weapon/CWaveBeam.hpp index db12f9b7d..9bb43e3f1 100644 --- a/Runtime/Weapon/CWaveBeam.hpp +++ b/Runtime/Weapon/CWaveBeam.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Weapon/CGunWeapon.hpp" -namespace urde { +namespace metaforce { class CWaveBeam final : public CGunWeapon { TCachedToken x21c_waveBeam; @@ -34,4 +34,4 @@ public: bool IsLoaded() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CWaveBuster.cpp b/Runtime/Weapon/CWaveBuster.cpp index 50a59e5b4..5aa698c22 100644 --- a/Runtime/Weapon/CWaveBuster.cpp +++ b/Runtime/Weapon/CWaveBuster.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CWaveBuster::CWaveBuster(const TToken& desc, EWeaponType type, const zeus::CTransform& xf, EMaterialTypes matType, const CDamageInfo& dInfo, TUniqueId uid, TAreaId aid, TUniqueId owner, @@ -69,4 +69,4 @@ std::optional CWaveBuster::GetTouchBounds() const { return GetProjectileBounds(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CWaveBuster.hpp b/Runtime/Weapon/CWaveBuster.hpp index 95245c8cc..f3f1faf00 100644 --- a/Runtime/Weapon/CWaveBuster.hpp +++ b/Runtime/Weapon/CWaveBuster.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CWaveBuster : public CGameProjectile { zeus::CTransform x2e8_originalXf; @@ -61,4 +61,4 @@ public: std::optional GetTouchBounds() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CWeapon.cpp b/Runtime/Weapon/CWeapon.cpp index ef5934533..3af683635 100644 --- a/Runtime/Weapon/CWeapon.cpp +++ b/Runtime/Weapon/CWeapon.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CWeapon::CWeapon(TUniqueId uid, TAreaId aid, bool active, TUniqueId owner, EWeaponType type, std::string_view name, const zeus::CTransform& xf, const CMaterialFilter& filter, const CMaterialList& mList, @@ -20,7 +20,7 @@ CWeapon::CWeapon(TUniqueId uid, TAreaId aid, bool active, TUniqueId owner, EWeap , x110_origDamageInfo(dInfo) , x12c_curDamageInfo(dInfo) {} -void CWeapon::Accept(urde::IVisitor& visitor) { visitor.Visit(this); } +void CWeapon::Accept(metaforce::IVisitor& visitor) { visitor.Visit(this); } void CWeapon::Think(float dt, CStateManager& mgr) { x148_curTime += dt; @@ -98,4 +98,4 @@ void CWeapon::FluidFXThink(EFluidState state, CScriptWater& water, CStateManager } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CWeapon.hpp b/Runtime/Weapon/CWeapon.hpp index 3c4a475cc..de2d5bd8d 100644 --- a/Runtime/Weapon/CWeapon.hpp +++ b/Runtime/Weapon/CWeapon.hpp @@ -8,7 +8,7 @@ #include "Runtime/World/CDamageInfo.hpp" #include "Runtime/Weapon/WeaponCommon.hpp" -namespace urde { +namespace metaforce { class CWeapon : public CActor { protected: EProjectileAttrib xe8_projectileAttribs; @@ -50,4 +50,4 @@ public: const CWeaponMode&, EProjectileAttrib) const override; void FluidFXThink(EFluidState state, CScriptWater& water, CStateManager& mgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CWeaponMgr.cpp b/Runtime/Weapon/CWeaponMgr.cpp index 28cfa89e0..2795f65c9 100644 --- a/Runtime/Weapon/CWeaponMgr.cpp +++ b/Runtime/Weapon/CWeaponMgr.cpp @@ -1,6 +1,6 @@ #include "Runtime/Weapon/CWeaponMgr.hpp" -namespace urde { +namespace metaforce { void CWeaponMgr::Add(TUniqueId uid, EWeaponType type) { auto iter = x0_weapons.emplace(uid, rstl::reserved_vector()).first; @@ -63,4 +63,4 @@ s32 CWeaponMgr::GetIndex(TUniqueId uid) const { return s32(std::distance(x0_weapons.cbegin(), iter)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CWeaponMgr.hpp b/Runtime/Weapon/CWeaponMgr.hpp index f9d2e5d8b..89241af7e 100644 --- a/Runtime/Weapon/CWeaponMgr.hpp +++ b/Runtime/Weapon/CWeaponMgr.hpp @@ -6,7 +6,7 @@ #include "Runtime/rstl.hpp" #include "Runtime/Weapon/WeaponCommon.hpp" -namespace urde { +namespace metaforce { class CWeaponMgr { std::map> x0_weapons; @@ -20,4 +20,4 @@ public: s32 GetIndex(TUniqueId) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/CWeaponMode.hpp b/Runtime/Weapon/CWeaponMode.hpp index 55371f8ae..e057bef77 100644 --- a/Runtime/Weapon/CWeaponMode.hpp +++ b/Runtime/Weapon/CWeaponMode.hpp @@ -2,7 +2,7 @@ #include "Runtime/Weapon/WeaponCommon.hpp" -namespace urde { +namespace metaforce { class CWeaponMode { EWeaponType x0_weaponType = EWeaponType::None; bool x4_24_charged : 1 = false; @@ -29,4 +29,4 @@ public: static constexpr CWeaponMode Bomb() { return CWeaponMode(EWeaponType::Bomb); } static constexpr CWeaponMode PowerBomb() { return CWeaponMode(EWeaponType::PowerBomb); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/Weapon/WeaponCommon.cpp b/Runtime/Weapon/WeaponCommon.cpp index ef6ade659..e20c4bbf9 100644 --- a/Runtime/Weapon/WeaponCommon.cpp +++ b/Runtime/Weapon/WeaponCommon.cpp @@ -7,7 +7,7 @@ #include "Runtime/Character/CAnimData.hpp" #include "Runtime/Character/CPrimitive.hpp" -namespace urde::NWeaponTypes { +namespace metaforce::NWeaponTypes { void primitive_set_to_token_vector(const CAnimData& animData, const std::set& primSet, std::vector& tokensOut, bool preLock) { @@ -159,4 +159,4 @@ CSfxHandle play_sfx(u16 sfx, bool underwater, bool looped, float pan) { return hnd; } -} // namespace urde::NWeaponTypes +} // namespace metaforce::NWeaponTypes diff --git a/Runtime/Weapon/WeaponCommon.hpp b/Runtime/Weapon/WeaponCommon.hpp index 74c183927..5f7a3b05c 100644 --- a/Runtime/Weapon/WeaponCommon.hpp +++ b/Runtime/Weapon/WeaponCommon.hpp @@ -10,7 +10,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Audio/CSfxManager.hpp" -namespace urde { +namespace metaforce { class CAnimData; class CPrimitive; class CStateManager; @@ -90,4 +90,4 @@ CSfxHandle play_sfx(u16 sfx, bool underwater, bool looped, float pan); } // namespace NWeaponTypes -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CActor.cpp b/Runtime/World/CActor.cpp index de84c2c7f..88cbf7061 100644 --- a/Runtime/World/CActor.cpp +++ b/Runtime/World/CActor.cpp @@ -18,7 +18,7 @@ #include -namespace urde { +namespace metaforce { static CMaterialList MakeActorMaterialList(const CMaterialList& materialList, const CActorParameters& params) { CMaterialList ret = materialList; if (params.GetVisorParameters().x0_4_b1) @@ -695,4 +695,4 @@ void CActor::MoveScannableObjectInfoToActor(CActor* act, CStateManager& mgr) { act->AddMaterial(EMaterialTypes::Scannable, mgr); RemoveMaterial(EMaterialTypes::Scannable, mgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CActor.hpp b/Runtime/World/CActor.hpp index 58c5c02f0..42ffe9fbc 100644 --- a/Runtime/World/CActor.hpp +++ b/Runtime/World/CActor.hpp @@ -13,7 +13,7 @@ #include -namespace urde { +namespace metaforce { class CActorParameters; class CWeaponMode; @@ -195,4 +195,4 @@ public: void MoveScannableObjectInfoToActor(CActor*, CStateManager&); const zeus::CAABox& GetRenderBounds() const { return x9c_renderBounds; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CActorModelParticles.cpp b/Runtime/World/CActorModelParticles.cpp index b3389203d..b9d97af7f 100644 --- a/Runtime/World/CActorModelParticles.cpp +++ b/Runtime/World/CActorModelParticles.cpp @@ -16,7 +16,7 @@ #include "Runtime/World/CScriptPlayerActor.hpp" #include "Runtime/World/CWorld.hpp" -namespace urde { +namespace metaforce { static bool IsMediumOrLarge(const CActor& act) { if (const TCastToConstPtr pat = act) { @@ -686,4 +686,4 @@ void CActorModelParticles::Render(const CStateManager& mgr, const CActor& actor) CGraphics::SetModelMatrix(backupModel); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CActorModelParticles.hpp b/Runtime/World/CActorModelParticles.hpp index 524ca1505..e4ce99e48 100644 --- a/Runtime/World/CActorModelParticles.hpp +++ b/Runtime/World/CActorModelParticles.hpp @@ -17,7 +17,7 @@ #include #include -namespace urde { +namespace metaforce { class CStateManager; class CEntity; class CElementGen; @@ -172,4 +172,4 @@ public: void LightDudeOnFire(CActor& act); const CTexture* GetAshyTexture(const CActor& act); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CActorParameters.hpp b/Runtime/World/CActorParameters.hpp index 32f76e370..a83124a64 100644 --- a/Runtime/World/CActorParameters.hpp +++ b/Runtime/World/CActorParameters.hpp @@ -7,7 +7,7 @@ #include "Runtime/World/CScannableParameters.hpp" #include "Runtime/World/CVisorParameters.hpp" -namespace urde { +namespace metaforce { class CActorParameters { friend class ScriptLoader; @@ -66,4 +66,4 @@ public: float GetFadeInTime() const { return x5c_fadeInTime; } float GetFadeOutTime() const { return x60_fadeOutTime; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CAi.cpp b/Runtime/World/CAi.cpp index 56e77bd79..c97dd2a97 100644 --- a/Runtime/World/CAi.cpp +++ b/Runtime/World/CAi.cpp @@ -7,7 +7,7 @@ #include "Runtime/World/CScriptWater.hpp" #include "Runtime/World/CStateMachine.hpp" -namespace urde { +namespace metaforce { static CMaterialList MakeAiMaterialList(const CMaterialList& in) { CMaterialList ret = in; @@ -48,11 +48,12 @@ void CAi::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager } EWeaponCollisionResponseTypes CAi::GetCollisionResponseType(const zeus::CVector3f&, const zeus::CVector3f&, - const urde::CWeaponMode&, urde::EProjectileAttrib) const { + const metaforce::CWeaponMode&, + metaforce::EProjectileAttrib) const { return EWeaponCollisionResponseTypes::EnemyNormal; } -void CAi::FluidFXThink(EFluidState state, CScriptWater& water, urde::CStateManager& mgr) { +void CAi::FluidFXThink(EFluidState state, CScriptWater& water, metaforce::CStateManager& mgr) { if (state == EFluidState::EnteredFluid || state == EFluidState::LeftFluid) { float dt = mgr.GetFluidPlaneManager()->GetLastSplashDeltaTime(GetUniqueId()); if (dt >= 0.02f) { @@ -85,4 +86,4 @@ CAiTriggerFunc CAi::GetTriggerFunc(std::string_view func) { return m_FuncMap->Ge const CStateMachine* CAi::GetStateMachine() const { return x2c8_stateMachine.GetObj(); } void CAi::CreateFuncLookup(CAiFuncMap* funcMap) { m_FuncMap = funcMap; } CAiFuncMap* CAi::m_FuncMap = nullptr; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CAi.hpp b/Runtime/World/CAi.hpp index de4dd8569..6770076c0 100644 --- a/Runtime/World/CAi.hpp +++ b/Runtime/World/CAi.hpp @@ -14,7 +14,7 @@ #include -namespace urde { +namespace metaforce { enum class EListenNoiseType { PlayerFire, BombExplode, ProjectileExplode }; @@ -187,4 +187,4 @@ public: virtual bool ShouldCallForBackup(CStateManager&, float) { return false; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CAiFuncMap.cpp b/Runtime/World/CAiFuncMap.cpp index 9518d5d10..5acfc0ec4 100644 --- a/Runtime/World/CAiFuncMap.cpp +++ b/Runtime/World/CAiFuncMap.cpp @@ -3,7 +3,7 @@ #include "Runtime/CStateManager.hpp" #include "Runtime/World/CAi.hpp" -namespace urde { +namespace metaforce { CAiFuncMap::CAiFuncMap() { /* Ai States */ x0_stateFuncs.reserve(55); @@ -156,4 +156,4 @@ CAiTriggerFunc CAiFuncMap::GetTriggerFunc(std::string_view func) const { return iter->second; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CAiFuncMap.hpp b/Runtime/World/CAiFuncMap.hpp index 5c77d53eb..53d939215 100644 --- a/Runtime/World/CAiFuncMap.hpp +++ b/Runtime/World/CAiFuncMap.hpp @@ -3,7 +3,7 @@ #include #include -namespace urde { +namespace metaforce { class CAi; class CStateManager; @@ -21,4 +21,4 @@ public: CAiStateFunc GetStateFunc(std::string_view func) const; CAiTriggerFunc GetTriggerFunc(std::string_view func) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CAmbientAI.cpp b/Runtime/World/CAmbientAI.cpp index 81f77c1da..b614e6049 100644 --- a/Runtime/World/CAmbientAI.cpp +++ b/Runtime/World/CAmbientAI.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CAmbientAI::CAmbientAI(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const zeus::CAABox& aabox, const CMaterialList& matList, float mass, @@ -135,4 +135,4 @@ void CAmbientAI::RandomizePlaybackRate(CStateManager& mgr) { GetModelData()->GetAnimationData()->MultiplyPlaybackRate(0.4f * mgr.GetActiveRandom()->Float() + 0.8f); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CAmbientAI.hpp b/Runtime/World/CAmbientAI.hpp index 67f799266..30fb4ea9f 100644 --- a/Runtime/World/CAmbientAI.hpp +++ b/Runtime/World/CAmbientAI.hpp @@ -13,7 +13,7 @@ namespace zeus { class CTransform; } -namespace urde { +namespace metaforce { class CAmbientAI : public CPhysicsActor { enum class EAnimationState { Ready, Alert, Impact }; @@ -44,4 +44,4 @@ public: void RandomizePlaybackRate(CStateManager&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CAnimationParameters.hpp b/Runtime/World/CAnimationParameters.hpp index 7cb29aedc..486ca8708 100644 --- a/Runtime/World/CAnimationParameters.hpp +++ b/Runtime/World/CAnimationParameters.hpp @@ -2,7 +2,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CAnimationParameters { CAssetId x0_ancs; @@ -22,4 +22,4 @@ public: void SetCharacter(u32 charIdx) { x4_charIdx = charIdx; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CDamageInfo.cpp b/Runtime/World/CDamageInfo.cpp index bed1c7d5b..7e7228173 100644 --- a/Runtime/World/CDamageInfo.cpp +++ b/Runtime/World/CDamageInfo.cpp @@ -4,7 +4,7 @@ #include "DataSpec/DNACommon/Tweaks/ITweakPlayerGun.hpp" -namespace urde { +namespace metaforce { CDamageInfo::CDamageInfo(const DataSpec::SShotParam& other) : x0_weaponMode(CWeaponMode(EWeaponType(other.weaponType), other.charged, other.combo, other.instaKill)) @@ -54,4 +54,4 @@ CDamageInfo::CDamageInfo(const CDamageInfo& other, float dt) { x14_knockback = other.x14_knockback; x18_24_noImmunity = true; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CDamageInfo.hpp b/Runtime/World/CDamageInfo.hpp index 15013f24e..40880fd05 100644 --- a/Runtime/World/CDamageInfo.hpp +++ b/Runtime/World/CDamageInfo.hpp @@ -8,7 +8,7 @@ namespace DataSpec { struct SShotParam; } -namespace urde { +namespace metaforce { class CDamageVulnerability; class CDamageInfo { CWeaponMode x0_weaponMode; @@ -67,4 +67,4 @@ public: x14_knockback *= m; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CDamageVulnerability.cpp b/Runtime/World/CDamageVulnerability.cpp index a5f64db54..9027bacbd 100644 --- a/Runtime/World/CDamageVulnerability.cpp +++ b/Runtime/World/CDamageVulnerability.cpp @@ -1,6 +1,6 @@ #include "Runtime/World/CDamageVulnerability.hpp" -namespace urde { +namespace metaforce { const CDamageVulnerability CDamageVulnerability::sNormalVulnerability( EVulnerability::Normal, EVulnerability::Normal, EVulnerability::Normal, EVulnerability::Normal, @@ -225,4 +225,4 @@ EVulnerability CDamageVulnerability::GetVulnerability(const CWeaponMode& mode, b return vuln; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CDamageVulnerability.hpp b/Runtime/World/CDamageVulnerability.hpp index b73587ad5..8c92526ed 100644 --- a/Runtime/World/CDamageVulnerability.hpp +++ b/Runtime/World/CDamageVulnerability.hpp @@ -3,7 +3,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Weapon/CWeaponMode.hpp" -namespace urde { +namespace metaforce { enum class EVulnerability { Weak, Normal, Deflect, Immune, PassThrough, DirectWeak, DirectNormal, DirectImmune }; enum class EDeflectType { None, One, Two, Three, Four }; @@ -123,4 +123,4 @@ public: static const CDamageVulnerability& ReflectVulnerabilty() { return sReflectVulnerability; } static const CDamageVulnerability& PassThroughVulnerabilty() { return sPassThroughVulnerability; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CDestroyableRock.cpp b/Runtime/World/CDestroyableRock.cpp index 893cd881b..ad8a774d8 100644 --- a/Runtime/World/CDestroyableRock.cpp +++ b/Runtime/World/CDestroyableRock.cpp @@ -3,7 +3,7 @@ #include "Runtime/CPlayerState.hpp" #include "Runtime/CStateManager.hpp" #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CDestroyableRock::CDestroyableRock(TUniqueId id, bool active, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& modelData, float mass, @@ -22,7 +22,7 @@ CDestroyableRock::CDestroyableRock(TUniqueId id, bool active, std::string_view n CreateShadow(false); } -void CDestroyableRock::Accept(urde::IVisitor& visitor) { visitor.Visit(this); } +void CDestroyableRock::Accept(metaforce::IVisitor& visitor) { visitor.Visit(this); } void CDestroyableRock::PreRender(CStateManager& mgr, const zeus::CFrustum& frustum) { if (GetActive()) { if (mgr.GetPlayerState()->GetActiveVisor(mgr) == CPlayerState::EPlayerVisor::Thermal) { @@ -60,4 +60,4 @@ void CDestroyableRock::Think(float dt, CStateManager& mgr) { xd0_damageMag = damageMag; CEntity::Think(dt, mgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CDestroyableRock.hpp b/Runtime/World/CDestroyableRock.hpp index b800d7088..8425f1fb7 100644 --- a/Runtime/World/CDestroyableRock.hpp +++ b/Runtime/World/CDestroyableRock.hpp @@ -4,7 +4,7 @@ #include "Runtime/World/CAi.hpp" -namespace urde { +namespace metaforce { class CDestroyableRock : public CAi { @@ -66,4 +66,4 @@ public: void Set_x340(bool v) { x340_ = v; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CEffect.cpp b/Runtime/World/CEffect.cpp index 619aa7e80..30e1fbf20 100644 --- a/Runtime/World/CEffect.cpp +++ b/Runtime/World/CEffect.cpp @@ -2,10 +2,10 @@ #include "Runtime/World/CActorParameters.hpp" -namespace urde { +namespace metaforce { CEffect::CEffect(TUniqueId uid, const CEntityInfo& info, bool active, std::string_view name, const zeus::CTransform& xf) : CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::NoStepLogic), CActorParameters::None(), kInvalidUniqueId) {} -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CEffect.hpp b/Runtime/World/CEffect.hpp index d43df85ee..e1966e2f2 100644 --- a/Runtime/World/CEffect.hpp +++ b/Runtime/World/CEffect.hpp @@ -2,7 +2,7 @@ #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CEffect : public CActor { public: @@ -12,4 +12,4 @@ public: void Render(CStateManager&) override {} }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CEnergyDrainSource.cpp b/Runtime/World/CEnergyDrainSource.cpp index dee555c64..15b1a7ae8 100644 --- a/Runtime/World/CEnergyDrainSource.cpp +++ b/Runtime/World/CEnergyDrainSource.cpp @@ -1,7 +1,7 @@ #include "Runtime/World/CEnergyDrainSource.hpp" -namespace urde { +namespace metaforce { CEnergyDrainSource::CEnergyDrainSource(TUniqueId src, float intensity) : x0_source(src), x4_intensity(intensity) {} -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CEnergyDrainSource.hpp b/Runtime/World/CEnergyDrainSource.hpp index c71e4713d..ee2e64bbd 100644 --- a/Runtime/World/CEnergyDrainSource.hpp +++ b/Runtime/World/CEnergyDrainSource.hpp @@ -2,7 +2,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CEnergyDrainSource { TUniqueId x0_source; float x4_intensity; @@ -13,4 +13,4 @@ public: void SetEnergyDrainIntensity(float in) { x4_intensity = in; } float GetEnergyDrainIntensity() const { return x4_intensity; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CEntity.cpp b/Runtime/World/CEntity.cpp index 5e5410215..e2cd2a00a 100644 --- a/Runtime/World/CEntity.cpp +++ b/Runtime/World/CEntity.cpp @@ -2,7 +2,7 @@ #include "Runtime/CStateManager.hpp" -namespace urde { +namespace metaforce { const std::vector CEntity::NullConnectionList; CEntity::CEntity(TUniqueId uniqueId, const CEntityInfo& info, bool active, std::string_view name) @@ -49,4 +49,4 @@ void CEntity::SendScriptMsgs(EScriptObjectState state, CStateManager& stateMgr, } } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CEntity.hpp b/Runtime/World/CEntity.hpp index 896011002..26e14543d 100644 --- a/Runtime/World/CEntity.hpp +++ b/Runtime/World/CEntity.hpp @@ -7,7 +7,7 @@ #include "Runtime/World/CEntityInfo.hpp" #include "Runtime/World/ScriptObjectSupport.hpp" -namespace urde { +namespace metaforce { class CStateManager; class IVisitor; @@ -61,4 +61,4 @@ public: std::string_view GetName() const { return x10_name; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CEntityInfo.hpp b/Runtime/World/CEntityInfo.hpp index abbfc09af..e9740bdf7 100644 --- a/Runtime/World/CEntityInfo.hpp +++ b/Runtime/World/CEntityInfo.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/World/ScriptObjectSupport.hpp" -namespace urde { +namespace metaforce { struct SConnection { EScriptObjectState x0_state; EScriptObjectMessage x4_msg; @@ -24,4 +24,4 @@ public: std::vector GetConnectionList() const { return x4_conns; } TEditorId GetEditorId() const { return x14_editorId; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CEnvFxManager.cpp b/Runtime/World/CEnvFxManager.cpp index d6e43acb9..d521e67ce 100644 --- a/Runtime/World/CEnvFxManager.cpp +++ b/Runtime/World/CEnvFxManager.cpp @@ -18,7 +18,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { static rstl::reserved_vector g_SnowForces; @@ -607,4 +607,4 @@ void CEnvFxManager::Initialize() { g_SnowForces.push_back(r.readVec2fBig()); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CEnvFxManager.hpp b/Runtime/World/CEnvFxManager.hpp index fa0645782..e2d215324 100644 --- a/Runtime/World/CEnvFxManager.hpp +++ b/Runtime/World/CEnvFxManager.hpp @@ -18,7 +18,7 @@ #include #include -namespace urde { +namespace metaforce { class CActor; class CStateManager; class CTexture; @@ -150,4 +150,4 @@ public: static void Initialize(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CExplosion.cpp b/Runtime/World/CExplosion.cpp index 6773279b2..2eb3224a8 100644 --- a/Runtime/World/CExplosion.cpp +++ b/Runtime/World/CExplosion.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CExplosion::CExplosion(const TLockedToken& particle, TUniqueId uid, bool active, const CEntityInfo& info, std::string_view name, const zeus::CTransform& xf, u32 flags, @@ -119,4 +119,4 @@ void CExplosion::Render(CStateManager& mgr) { } bool CExplosion::CanRenderUnsorted(const CStateManager&) const { return false; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CExplosion.hpp b/Runtime/World/CExplosion.hpp index 36bd81f51..2280234d6 100644 --- a/Runtime/World/CExplosion.hpp +++ b/Runtime/World/CExplosion.hpp @@ -7,7 +7,7 @@ #include "Runtime/Particle/CGenDescription.hpp" #include "Runtime/World/CEffect.hpp" -namespace urde { +namespace metaforce { class CExplosion : public CEffect { std::unique_ptr xe8_particleGen; @@ -38,4 +38,4 @@ public: bool CanRenderUnsorted(const CStateManager&) const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFire.cpp b/Runtime/World/CFire.cpp index 75b8db4df..ac8347a83 100644 --- a/Runtime/World/CFire.cpp +++ b/Runtime/World/CFire.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CFire::CFire(TToken effect, TUniqueId uid, TAreaId aId, bool active, TUniqueId owner, const zeus::CTransform& xf, const CDamageInfo& dInfo, const zeus::CAABox& aabox, const zeus::CVector3f& vec, bool b1, CAssetId visorEffect, bool b2, bool b3, bool b4, float f1, float f2, @@ -101,4 +101,4 @@ void CFire::AddToRenderer(const zeus::CFrustum& frustum, CStateManager& mgr) { CActor::AddToRenderer(frustum, mgr); } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/World/CFire.hpp b/Runtime/World/CFire.hpp index 6830e638d..c55955d38 100644 --- a/Runtime/World/CFire.hpp +++ b/Runtime/World/CFire.hpp @@ -6,7 +6,7 @@ #include "Runtime/World/CActor.hpp" #include "Runtime/World/CDamageInfo.hpp" -namespace urde { +namespace metaforce { class CElementGen; class CFire : public CActor { std::unique_ptr xe8_; @@ -45,4 +45,4 @@ public: void Touch(CActor&, CStateManager&) override; void AddToRenderer(const zeus::CFrustum&, CStateManager&) override; }; -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/World/CFishCloud.cpp b/Runtime/World/CFishCloud.cpp index 125a2f7ad..e5175a55a 100644 --- a/Runtime/World/CFishCloud.cpp +++ b/Runtime/World/CFishCloud.cpp @@ -13,7 +13,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CFishCloud::CFishCloud(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& info, const zeus::CVector3f& scale, const zeus::CTransform& xf, CModelData&& mData, @@ -782,4 +782,4 @@ bool CFishCloud::AddAttractor(TUniqueId sourceId, bool swirl, float radius, floa return false; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFishCloud.hpp b/Runtime/World/CFishCloud.hpp index e859d1f50..947d1b53b 100644 --- a/Runtime/World/CFishCloud.hpp +++ b/Runtime/World/CFishCloud.hpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { class CFishCloud : public CActor { class CBoid { @@ -150,4 +150,4 @@ public: bool AddAttractor(TUniqueId source, bool swirl, float radius, float priority); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFishCloudModifier.cpp b/Runtime/World/CFishCloudModifier.cpp index 1d4277659..517bf3489 100644 --- a/Runtime/World/CFishCloudModifier.cpp +++ b/Runtime/World/CFishCloudModifier.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CFishCloudModifier::CFishCloudModifier(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& eInfo, const zeus::CVector3f& pos, bool isRepulsor, bool swirl, float radius, float priority) @@ -55,4 +55,4 @@ void CFishCloudModifier::RemoveSelf(CStateManager& mgr) { } } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFishCloudModifier.hpp b/Runtime/World/CFishCloudModifier.hpp index 0d5efde12..f21b320cb 100644 --- a/Runtime/World/CFishCloudModifier.hpp +++ b/Runtime/World/CFishCloudModifier.hpp @@ -2,7 +2,7 @@ #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CFishCloudModifier : public CActor { float xe8_radius; float xec_priority; @@ -19,4 +19,4 @@ public: void AddSelf(CStateManager&); void RemoveSelf(CStateManager&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFluidPlane.cpp b/Runtime/World/CFluidPlane.cpp index e9744ac43..5cc16905a 100644 --- a/Runtime/World/CFluidPlane.cpp +++ b/Runtime/World/CFluidPlane.cpp @@ -6,7 +6,7 @@ #include "Runtime/World/CRipple.hpp" #include "Runtime/World/CScriptWater.hpp" -namespace urde { +namespace metaforce { CFluidPlane::CFluidPlane(CAssetId texPattern1, CAssetId texPattern2, CAssetId texColor, float alpha, EFluidType fluidType, float rippleIntensity, const CFluidUVMotion& motion) @@ -483,4 +483,4 @@ void CFluidPlane::RenderPatch(const CFluidPlaneRender::SPatchInfo& info, const H } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFluidPlane.hpp b/Runtime/World/CFluidPlane.hpp index 73eb051d4..753a0df56 100644 --- a/Runtime/World/CFluidPlane.hpp +++ b/Runtime/World/CFluidPlane.hpp @@ -17,7 +17,7 @@ #include #include -namespace urde { +namespace metaforce { class CFluidUVMotion; class CRipple; class CRippleManager; @@ -179,4 +179,4 @@ public: const CTexture& GetTexturePattern2() const { return *x20_texPattern2; } bool HasTexturePattern2() const { return x20_texPattern2.HasReference(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFluidPlaneCPU.cpp b/Runtime/World/CFluidPlaneCPU.cpp index 5eba767cd..c36529250 100644 --- a/Runtime/World/CFluidPlaneCPU.cpp +++ b/Runtime/World/CFluidPlaneCPU.cpp @@ -10,7 +10,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { constexpr u32 kTableSize = 2048; CFluidPlaneCPU::CTurbulence::CTurbulence(float speed, float distance, float freqMax, float freqMin, float phaseMax, @@ -872,4 +872,4 @@ void CFluidPlaneCPU::Render(const CStateManager& mgr, float alpha, const zeus::C m_shader->doneDrawing(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFluidPlaneCPU.hpp b/Runtime/World/CFluidPlaneCPU.hpp index b3e53a76c..5d5329f5c 100644 --- a/Runtime/World/CFluidPlaneCPU.hpp +++ b/Runtime/World/CFluidPlaneCPU.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CFluidUVMotion; class CFluidPlaneCPU : public CFluidPlane { @@ -121,4 +121,4 @@ public: bool HasTurbulence() const { return x120_turbulence.HasTurbulence(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFluidPlaneDoor.cpp b/Runtime/World/CFluidPlaneDoor.cpp index 5cc804d00..fb7e3e2e8 100644 --- a/Runtime/World/CFluidPlaneDoor.cpp +++ b/Runtime/World/CFluidPlaneDoor.cpp @@ -3,7 +3,7 @@ #include "Runtime/CStateManager.hpp" #include "Runtime/World/CFluidPlaneCPU.hpp" -namespace urde { +namespace metaforce { CFluidPlaneDoor::CFluidPlaneDoor(CAssetId patternTex1, CAssetId patternTex2, CAssetId colorTex, float tileSize, u32 tileSubdivisions, EFluidType fluidType, float alpha, @@ -102,4 +102,4 @@ void CFluidPlaneDoor::Render(const CStateManager& mgr, float alpha, const zeus:: m_shader->doneDrawing(); } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/World/CFluidPlaneDoor.hpp b/Runtime/World/CFluidPlaneDoor.hpp index 32ca87014..333c6df41 100644 --- a/Runtime/World/CFluidPlaneDoor.hpp +++ b/Runtime/World/CFluidPlaneDoor.hpp @@ -5,7 +5,7 @@ #include "Runtime/Graphics/Shaders/CFluidPlaneShader.hpp" #include "Runtime/World/CFluidPlane.hpp" -namespace urde { +namespace metaforce { class CFluidPlaneDoor final : public CFluidPlane { float xa0_tileSize; int xa4_tileSubdivisions; @@ -29,4 +29,4 @@ public: u32 gridDimX, u32 gridDimY, const zeus::CVector3f& areaCenter) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFluidPlaneGPU.cpp b/Runtime/World/CFluidPlaneGPU.cpp index 6495ab4d7..5d53aa0c1 100644 --- a/Runtime/World/CFluidPlaneGPU.cpp +++ b/Runtime/World/CFluidPlaneGPU.cpp @@ -1,6 +1,6 @@ #include "Runtime/World/CFluidPlaneGPU.hpp" -namespace urde { +namespace metaforce { CFluidPlaneGPU::CFluidPlaneGPU(CAssetId texPattern1, CAssetId texPattern2, CAssetId texColor, CAssetId bumpMap, CAssetId envMap, CAssetId envBumpMap, CAssetId lightMap, float unitsPerLightmapTexel, @@ -78,4 +78,4 @@ void CFluidPlaneGPU::RenderStripWithRipples(float curY, const Heights& heights, } } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/World/CFluidPlaneGPU.hpp b/Runtime/World/CFluidPlaneGPU.hpp index b735a1e09..e1f796bd9 100644 --- a/Runtime/World/CFluidPlaneGPU.hpp +++ b/Runtime/World/CFluidPlaneGPU.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CFluidPlaneCPU.hpp" -namespace urde { +namespace metaforce { class CFluidPlaneGPU final : public CFluidPlaneCPU { public: @@ -22,4 +22,4 @@ public: std::vector& pvOut) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFluidPlaneManager.cpp b/Runtime/World/CFluidPlaneManager.cpp index 48917c26f..186991c71 100644 --- a/Runtime/World/CFluidPlaneManager.cpp +++ b/Runtime/World/CFluidPlaneManager.cpp @@ -4,7 +4,7 @@ #include "Runtime/World/CExplosion.hpp" #include "Runtime/World/CScriptWater.hpp" -namespace urde { +namespace metaforce { CFluidPlaneManager::CFluidProfile CFluidPlaneManager::sProfile = {}; @@ -143,4 +143,4 @@ void CFluidPlaneManager::SetupRippleMap() { } BooTrace); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFluidPlaneManager.hpp b/Runtime/World/CFluidPlaneManager.hpp index e492a9480..903cb4675 100644 --- a/Runtime/World/CFluidPlaneManager.hpp +++ b/Runtime/World/CFluidPlaneManager.hpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { class CStateManager; class CScriptWater; @@ -63,4 +63,4 @@ public: CRippleManager& RippleManager() { return x0_rippleManager; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFluidUVMotion.cpp b/Runtime/World/CFluidUVMotion.cpp index 2018038ec..4d8c41345 100644 --- a/Runtime/World/CFluidUVMotion.cpp +++ b/Runtime/World/CFluidUVMotion.cpp @@ -4,7 +4,7 @@ #include -namespace urde { +namespace metaforce { CFluidUVMotion::CFluidUVMotion(float timeToWrap, float orientation, const SFluidLayerMotion& colorLayer, const SFluidLayerMotion& pattern1Layer, const SFluidLayerMotion& pattern2Layer) @@ -61,4 +61,4 @@ CFluidUVMotion::FluidOffsets CFluidUVMotion::CalculateFluidTextureOffset(float t return offsets; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CFluidUVMotion.hpp b/Runtime/World/CFluidUVMotion.hpp index e8d1eb8dd..9de9a079e 100644 --- a/Runtime/World/CFluidUVMotion.hpp +++ b/Runtime/World/CFluidUVMotion.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/rstl.hpp" -namespace urde { +namespace metaforce { class CFluidUVMotion { public: enum class EFluidUVMotion { @@ -53,4 +53,4 @@ public: // In game binaries this uses an out pointer instead of return by value. FluidOffsets CalculateFluidTextureOffset(float t) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CGameArea.cpp b/Runtime/World/CGameArea.cpp index ff2f8a18b..5c0f7b220 100644 --- a/Runtime/World/CGameArea.cpp +++ b/Runtime/World/CGameArea.cpp @@ -14,7 +14,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { static logvisor::Module Log("CGameArea"); @@ -316,8 +316,8 @@ CDummyGameArea::CDummyGameArea(CInputStream& in, int idx, int mlvlVersion) { for (u32 i = 0; i < attachAreaCount; ++i) x44_attachedAreaIndices.push_back(in.readUint16Big()); - ::urde::ReadDependencyList(in); - ::urde::ReadDependencyList(in); + ::metaforce::ReadDependencyList(in); + ::metaforce::ReadDependencyList(in); if (mlvlVersion > 13) { u32 depCount = in.readUint32Big(); @@ -367,8 +367,8 @@ CGameArea::CGameArea(CInputStream& in, int idx, int mlvlVersion) : x4_selfIdx(id x8c_attachedAreaIndices.emplace_back(in.readUint16Big()); } - x9c_deps1 = ::urde::ReadDependencyList(in); - xac_deps2 = ::urde::ReadDependencyList(in); + x9c_deps1 = ::metaforce::ReadDependencyList(in); + xac_deps2 = ::metaforce::ReadDependencyList(in); const zeus::CAABox aabb = x6c_aabb.getTransformedAABox(xc_transform); x6c_aabb = aabb; @@ -1264,4 +1264,4 @@ void CGameArea::DebugDrawLight(const CLight& light) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CGameArea.hpp b/Runtime/World/CGameArea.hpp index b4625b852..dd0e82785 100644 --- a/Runtime/World/CGameArea.hpp +++ b/Runtime/World/CGameArea.hpp @@ -23,7 +23,7 @@ #include #include -namespace urde { +namespace metaforce { class CStateManager; class CScriptAreaAttributes; struct SMREAHeader { @@ -370,4 +370,4 @@ public: void DebugDrawLight(const CLight& light); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CGameLight.cpp b/Runtime/World/CGameLight.cpp index 84e090164..2a7cb77fe 100644 --- a/Runtime/World/CGameLight.cpp +++ b/Runtime/World/CGameLight.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CGameLight::CGameLight(TUniqueId uid, TAreaId aid, bool active, std::string_view name, const zeus::CTransform& xf, TUniqueId parentId, const CLight& light, u32 sourceId, u32 priority, float lifeTime) @@ -82,4 +82,4 @@ void CGameLight::DebugDraw() { m_debugModel->Render(CModelData::EWhichModel::Normal, x34_transform, nullptr, modelFlags); } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CGameLight.hpp b/Runtime/World/CGameLight.hpp index ac6b6e312..8da595ec8 100644 --- a/Runtime/World/CGameLight.hpp +++ b/Runtime/World/CGameLight.hpp @@ -6,7 +6,7 @@ #include "Runtime/World/CActor.hpp" #include "Runtime/Graphics/CLight.hpp" -namespace urde { +namespace metaforce { class CGameLight : public CActor { TUniqueId xe8_parentId; CLight xec_light; @@ -30,4 +30,4 @@ public: void DebugDraw(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CGrappleParameters.hpp b/Runtime/World/CGrappleParameters.hpp index 18375018c..21df68ecb 100644 --- a/Runtime/World/CGrappleParameters.hpp +++ b/Runtime/World/CGrappleParameters.hpp @@ -1,6 +1,6 @@ #pragma once -namespace urde { +namespace metaforce { class CGrappleParameters { float x0_a; @@ -35,4 +35,4 @@ public: bool GetLockSwingTurn() const { return x2c_lockSwingTurn; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CHUDBillboardEffect.cpp b/Runtime/World/CHUDBillboardEffect.cpp index 450c33192..deb55abc5 100644 --- a/Runtime/World/CHUDBillboardEffect.cpp +++ b/Runtime/World/CHUDBillboardEffect.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { u32 CHUDBillboardEffect::g_IndirectTexturedBillboardCount = 0; u32 CHUDBillboardEffect::g_BillboardCount = 0; @@ -105,4 +105,4 @@ float CHUDBillboardEffect::GetNearClipDistance(CStateManager& mgr) { zeus::CVector3f CHUDBillboardEffect::GetScaleForPOV(CStateManager& mgr) { return {0.155f, 1.f, 0.155f}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CHUDBillboardEffect.hpp b/Runtime/World/CHUDBillboardEffect.hpp index 8b0e77d34..2794491d4 100644 --- a/Runtime/World/CHUDBillboardEffect.hpp +++ b/Runtime/World/CHUDBillboardEffect.hpp @@ -12,7 +12,7 @@ #include -namespace urde { +namespace metaforce { class CGenDescription; class CElectricDescription; @@ -48,4 +48,4 @@ public: static zeus::CVector3f GetScaleForPOV(CStateManager& mgr); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CHUDMemoParms.hpp b/Runtime/World/CHUDMemoParms.hpp index 761f8a00b..cceac81d7 100644 --- a/Runtime/World/CHUDMemoParms.hpp +++ b/Runtime/World/CHUDMemoParms.hpp @@ -2,7 +2,7 @@ #include "Runtime/IOStreams.hpp" -namespace urde { +namespace metaforce { class CHUDMemoParms { float x0_dispTime = 0.f; @@ -25,4 +25,4 @@ public: bool IsHintMemo() const { return x6_hintMemo; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CHealthInfo.cpp b/Runtime/World/CHealthInfo.cpp index 3a9f93d6f..efee7e7e9 100644 --- a/Runtime/World/CHealthInfo.cpp +++ b/Runtime/World/CHealthInfo.cpp @@ -1,6 +1,6 @@ #include "Runtime/World/CHealthInfo.hpp" -namespace urde { +namespace metaforce { CHealthInfo::CHealthInfo(CInputStream& in) { in.readUint32Big(); @@ -8,4 +8,4 @@ CHealthInfo::CHealthInfo(CInputStream& in) { x4_knockbackResistance = in.readFloatBig(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CHealthInfo.hpp b/Runtime/World/CHealthInfo.hpp index a69b52035..60c9dbd6a 100644 --- a/Runtime/World/CHealthInfo.hpp +++ b/Runtime/World/CHealthInfo.hpp @@ -2,7 +2,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CHealthInfo { float x0_health; @@ -20,4 +20,4 @@ public: void SetKnockbackResistance(float r) { x4_knockbackResistance = r; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CIceImpact.cpp b/Runtime/World/CIceImpact.cpp index db176105f..703efd104 100644 --- a/Runtime/World/CIceImpact.cpp +++ b/Runtime/World/CIceImpact.cpp @@ -2,7 +2,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CIceImpact::CIceImpact(const TLockedToken& particle, TUniqueId uid, TAreaId aid, bool active, std::string_view name, const zeus::CTransform& xf, u32 flags, const zeus::CVector3f& scale, @@ -11,4 +11,4 @@ CIceImpact::CIceImpact(const TLockedToken& particle, TUniqueId void CIceImpact::Accept(IVisitor& visitor) { visitor.Visit(this); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CIceImpact.hpp b/Runtime/World/CIceImpact.hpp index a746ad7f3..5f9b74a05 100644 --- a/Runtime/World/CIceImpact.hpp +++ b/Runtime/World/CIceImpact.hpp @@ -2,7 +2,7 @@ #include "Runtime/World/CEffect.hpp" -namespace urde { +namespace metaforce { class CIceImpact : public CEffect { public: @@ -12,4 +12,4 @@ public: void Accept(IVisitor& visitor) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CKnockBackController.cpp b/Runtime/World/CKnockBackController.cpp index 6300e4e2d..ef3fb8338 100644 --- a/Runtime/World/CKnockBackController.cpp +++ b/Runtime/World/CKnockBackController.cpp @@ -4,7 +4,7 @@ #include "Runtime/Character/CPASAnimParmData.hpp" #include "Runtime/World/CPatterned.hpp" -namespace urde { +namespace metaforce { constexpr std::array, 19>, 3> KnockBackParmsTable{{ {{ @@ -633,4 +633,4 @@ void CKnockBackController::KnockBack(const zeus::CVector3f& backVec, CStateManag ResetKnockBackImpulse(parent, vec, 2.f); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CKnockBackController.hpp b/Runtime/World/CKnockBackController.hpp index 82a0f500a..adb0fcf03 100644 --- a/Runtime/World/CKnockBackController.hpp +++ b/Runtime/World/CKnockBackController.hpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { class CDamageInfo; class CPatterned; @@ -142,4 +142,4 @@ public: bool TestAvailableState(EKnockBackAnimationState s) const { return x80_availableStates.test(size_t(s)); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CLightParameters.hpp b/Runtime/World/CLightParameters.hpp index 2e4779dfb..f7d1daa7c 100644 --- a/Runtime/World/CLightParameters.hpp +++ b/Runtime/World/CLightParameters.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class CLightParameters { friend class CActor; @@ -95,4 +95,4 @@ public: const zeus::CColor& GetNoLightsAmbient() const { return x18_noLightsAmbient; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CMorphBall.cpp b/Runtime/World/CMorphBall.cpp index 6a1d83da7..f2b69bb1d 100644 --- a/Runtime/World/CMorphBall.cpp +++ b/Runtime/World/CMorphBall.cpp @@ -20,7 +20,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { namespace { float kSpiderBallCollisionRadius; @@ -2409,4 +2409,4 @@ void CMorphBall::StopEffects() { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CMorphBall.hpp b/Runtime/World/CMorphBall.hpp index d918aa877..9dcc70d40 100644 --- a/Runtime/World/CMorphBall.hpp +++ b/Runtime/World/CMorphBall.hpp @@ -17,7 +17,7 @@ #include #include -namespace urde { +namespace metaforce { class CActorLights; class CDamageInfo; class CPlayer; @@ -291,4 +291,4 @@ public: static const std::array BallAuxGlowColors; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CMorphBallShadow.cpp b/Runtime/World/CMorphBallShadow.cpp index 0d60b55e0..94164dfdd 100644 --- a/Runtime/World/CMorphBallShadow.cpp +++ b/Runtime/World/CMorphBallShadow.cpp @@ -7,7 +7,7 @@ #include "Runtime/World/CPlayer.hpp" #include "Runtime/World/CWorld.hpp" -namespace urde { +namespace metaforce { void CMorphBallShadow::GatherAreas(const CStateManager& mgr) { x18_areas.clear(); @@ -138,4 +138,4 @@ void CMorphBallShadow::Render(const CStateManager& mgr, float alpha) { g_Renderer->DrawOverlappingWorldModelShadows(alphaVal, x30_worldModelBits, xb8_shadowVolume, alpha); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CMorphBallShadow.hpp b/Runtime/World/CMorphBallShadow.hpp index e1c281c40..9deb7881e 100644 --- a/Runtime/World/CMorphBallShadow.hpp +++ b/Runtime/World/CMorphBallShadow.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CActor; class CGameArea; class CPlayer; @@ -32,4 +32,4 @@ public: void Render(const CStateManager& mgr, float alpha); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPathFindArea.cpp b/Runtime/World/CPathFindArea.cpp index ec3aae84b..131852a14 100644 --- a/Runtime/World/CPathFindArea.cpp +++ b/Runtime/World/CPathFindArea.cpp @@ -3,7 +3,7 @@ #include "Runtime/CToken.hpp" #include "Runtime/IVParamObj.hpp" -namespace urde { +namespace metaforce { static logvisor::Module Log("CPathFindArea"); @@ -265,8 +265,8 @@ bool CPFArea::PathExists(const CPFRegion* r1, const CPFRegion* r2, u32 flags) co return ((x168_connectionsGround[d.quot] >> u32(d.rem)) & 0x1u) != 0; } -CFactoryFnReturn FPathFindAreaFactory(const urde::SObjectTag& tag, std::unique_ptr&& in, u32 len, - const urde::CVParamTransfer& vparms, CObjectReference*) { +CFactoryFnReturn FPathFindAreaFactory(const metaforce::SObjectTag& tag, std::unique_ptr&& in, u32 len, + const metaforce::CVParamTransfer& vparms, CObjectReference*) { return TToken::GetIObjObjectFor(std::make_unique(std::move(in), len)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPathFindArea.hpp b/Runtime/World/CPathFindArea.hpp index 0f586702d..f96081bd4 100644 --- a/Runtime/World/CPathFindArea.hpp +++ b/Runtime/World/CPathFindArea.hpp @@ -13,7 +13,7 @@ #include #include -namespace urde { +namespace metaforce { class CVParamTransfer; class CObjectReference; @@ -112,6 +112,6 @@ public: bool PathExists(const CPFRegion* r1, const CPFRegion* r2, u32 flags) const; }; -CFactoryFnReturn FPathFindAreaFactory(const urde::SObjectTag& tag, std::unique_ptr&& in, u32 len, - const urde::CVParamTransfer& vparms, CObjectReference* selfRef); -} // namespace urde +CFactoryFnReturn FPathFindAreaFactory(const metaforce::SObjectTag& tag, std::unique_ptr&& in, u32 len, + const metaforce::CVParamTransfer& vparms, CObjectReference* selfRef); +} // namespace metaforce diff --git a/Runtime/World/CPathFindRegion.cpp b/Runtime/World/CPathFindRegion.cpp index 56f00621c..dc74b710d 100644 --- a/Runtime/World/CPathFindRegion.cpp +++ b/Runtime/World/CPathFindRegion.cpp @@ -2,7 +2,7 @@ #include "Runtime/World/CPathFindArea.hpp" -namespace urde { +namespace metaforce { CPFNode::CPFNode(CMemoryInStream& in) { x0_position.readBig(in); @@ -267,4 +267,4 @@ bool CPFRegion::IsPointInsidePaddedAABox(const zeus::CVector3f& point, float pad point.z() >= x34_aabb.min.z() - padding && point.z() <= x34_aabb.max.z() + padding; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPathFindRegion.hpp b/Runtime/World/CPathFindRegion.hpp index 5bb294f88..226c6d951 100644 --- a/Runtime/World/CPathFindRegion.hpp +++ b/Runtime/World/CPathFindRegion.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CPFArea; class CPFLink; class CPFRegionData; @@ -132,4 +132,4 @@ public: x14_cost = x18_g + x1c_h; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPathFindSearch.cpp b/Runtime/World/CPathFindSearch.cpp index 65620edde..0cc8a912f 100644 --- a/Runtime/World/CPathFindSearch.cpp +++ b/Runtime/World/CPathFindSearch.cpp @@ -2,7 +2,7 @@ #include "Runtime/Graphics/CGraphics.hpp" -namespace urde { +namespace metaforce { CPathFindSearch::CPathFindSearch(CPFArea* area, u32 flags, u32 index, float chRadius, float chHeight) : x0_area(area), xd0_chHeight(chHeight), xd4_chRadius(chRadius), xdc_flags(flags), xe0_indexMask(1u << index) {} @@ -364,4 +364,4 @@ void CPathFindSearch::DebugDraw() { m_viz->Draw(*this); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPathFindSearch.hpp b/Runtime/World/CPathFindSearch.hpp index 26eeef532..27b8ac883 100644 --- a/Runtime/World/CPathFindSearch.hpp +++ b/Runtime/World/CPathFindSearch.hpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { class CPathFindSearch; class CPathFindVisualizer { @@ -64,4 +64,4 @@ public: void DebugDraw(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPathFindSpline.cpp b/Runtime/World/CPathFindSpline.cpp index 32680d42e..cae5b49ad 100644 --- a/Runtime/World/CPathFindSpline.cpp +++ b/Runtime/World/CPathFindSpline.cpp @@ -1,6 +1,6 @@ #include "Runtime/World/CPathFindSearch.hpp" -namespace urde { +namespace metaforce { bool CPathFindSearch::SegmentOver(const zeus::CVector3f& p1) const { if (x4_waypoints.size() > 1 && xc8_curWaypoint < x4_waypoints.size() - 1) { @@ -70,4 +70,4 @@ float CPathFindSearch::RemainingPathDistance(const zeus::CVector3f& pos) const { return f31; } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/World/CPatterned.cpp b/Runtime/World/CPatterned.cpp index a2e6010f8..548463a6b 100644 --- a/Runtime/World/CPatterned.cpp +++ b/Runtime/World/CPatterned.cpp @@ -24,7 +24,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path #include -namespace urde { +namespace metaforce { namespace { hecl::CVar* cv_disableAi = nullptr; } // namespace @@ -105,7 +105,7 @@ CPatterned::CPatterned(ECharacter character, TUniqueId uid, std::string_view nam } } -void CPatterned::Accept(urde::IVisitor& visitor) { visitor.Visit(this); } +void CPatterned::Accept(metaforce::IVisitor& visitor) { visitor.Visit(this); } void CPatterned::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) { CAi::AcceptScriptMsg(msg, uid, mgr); @@ -417,13 +417,13 @@ void CPatterned::Touch(CActor& act, CStateManager& mgr) { std::optional CPatterned::GetTouchBounds() const { return GetBoundingBox(); } -bool CPatterned::CanRenderUnsorted(const urde::CStateManager& mgr) const { +bool CPatterned::CanRenderUnsorted(const metaforce::CStateManager& mgr) const { return x64_modelData->GetAnimationData()->GetParticleDB().AreAnySystemsDrawnWithModel() ? false : CActor::CanRenderUnsorted(mgr); } -zeus::CVector3f CPatterned::GetAimPosition(const urde::CStateManager& mgr, float dt) const { +zeus::CVector3f CPatterned::GetAimPosition(const metaforce::CStateManager& mgr, float dt) const { zeus::CVector3f offset; if (dt > 0.f) { offset = PredictMotion(dt).x0_translation; @@ -1006,7 +1006,7 @@ void CPatterned::TryKnockBack_Front(CStateManager& mgr, int arg) { x450_bodyController->GetCommandMgr().DeliverCmd(CBCKnockBackCmd(GetTransform().frontVector(), pas::ESeverity(arg))); } -void CPatterned::TryGenerateDeactivate(urde::CStateManager& mgr, int arg) { +void CPatterned::TryGenerateDeactivate(metaforce::CStateManager& mgr, int arg) { x450_bodyController->GetCommandMgr().DeliverCmd(CBCGenerateCmd(pas::EGenerateType(arg), zeus::skZero3f)); } @@ -1835,4 +1835,4 @@ void CPatterned::Initialize() { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPatterned.hpp b/Runtime/World/CPatterned.hpp index 6a41e9f43..ad4f2e09c 100644 --- a/Runtime/World/CPatterned.hpp +++ b/Runtime/World/CPatterned.hpp @@ -22,7 +22,7 @@ #define DEFINE_PATTERNED(type) static constexpr ECharacter CharacterType = ECharacter::type #endif -namespace urde { +namespace metaforce { class CPatternedInfo; class CProjectileInfo; class CPathFindSearch; @@ -420,4 +420,4 @@ public: static void Initialize(); // endregion }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPatternedInfo.cpp b/Runtime/World/CPatternedInfo.cpp index bd10bd176..48052d52a 100644 --- a/Runtime/World/CPatternedInfo.cpp +++ b/Runtime/World/CPatternedInfo.cpp @@ -2,7 +2,7 @@ #include "Runtime/Audio/CSfxManager.hpp" -namespace urde { +namespace metaforce { CPatternedInfo::CPatternedInfo(CInputStream& in, u32 pcount) : x0_mass(in.readFloatBig()) @@ -52,4 +52,4 @@ std::pair CPatternedInfo::HasCorrectParameterCount(CInputStream& in) u32 pcount = in.readUint32Big(); return {(pcount >= 35 && pcount <= 38), pcount}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPatternedInfo.hpp b/Runtime/World/CPatternedInfo.hpp index 2cb0a9b00..050903147 100644 --- a/Runtime/World/CPatternedInfo.hpp +++ b/Runtime/World/CPatternedInfo.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CPatternedInfo { friend class CPatterned; @@ -71,4 +71,4 @@ public: bool GetActive() const { return xf8_active; } void SetActive(bool active) { xf8_active = active; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPhysicsActor.cpp b/Runtime/World/CPhysicsActor.cpp index 1c0a10fd6..ec0da2d89 100644 --- a/Runtime/World/CPhysicsActor.cpp +++ b/Runtime/World/CPhysicsActor.cpp @@ -2,7 +2,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CPhysicsActor::CPhysicsActor(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CMaterialList& matList, @@ -310,4 +310,4 @@ void CPhysicsActor::UseCollisionImpulses() { ComputeDerivedQuantities(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPhysicsActor.hpp b/Runtime/World/CPhysicsActor.hpp index e8f94d04b..b4daaba05 100644 --- a/Runtime/World/CPhysicsActor.hpp +++ b/Runtime/World/CPhysicsActor.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { class CCollisionInfoList; struct SMoverData; @@ -209,4 +209,4 @@ public: void UseCollisionImpulses(); static constexpr float GravityConstant() { return 9.81f * 2.5f; } /* 9.81 m/s ^ 2 is normal acceleration under earth gravity, Tallon 4 is 2.5 times that */ }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPlayer.cpp b/Runtime/World/CPlayer.cpp index 68a9beabf..7fcbfc570 100644 --- a/Runtime/World/CPlayer.cpp +++ b/Runtime/World/CPlayer.cpp @@ -34,9 +34,9 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { namespace { -logvisor::Module Log("urde::CPlayer"); +logvisor::Module Log("metaforce::CPlayer"); constexpr CMaterialFilter SolidMaterialFilter = CMaterialFilter::MakeInclude(CMaterialList(EMaterialTypes::Solid)); @@ -6272,4 +6272,4 @@ float CPlayer::GetAverageSpeed() const { return x4f8_moveSpeed; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPlayer.hpp b/Runtime/World/CPlayer.hpp index 919f45d79..ea30fe013 100644 --- a/Runtime/World/CPlayer.hpp +++ b/Runtime/World/CPlayer.hpp @@ -14,7 +14,7 @@ #include #include -namespace urde { +namespace metaforce { class CCollidableSphere; class CDamageInfo; class CFirstPersonCamera; @@ -623,4 +623,4 @@ public: void SetNoDamageLoopSfx(bool val) { x9c7_24_noDamageLoopSfx = val; } void SetAccelerationChangeTimer(float time) { x2d4_accelerationChangeTimer = time; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPlayerCameraBob.cpp b/Runtime/World/CPlayerCameraBob.cpp index fb38d13e1..84656c2f3 100644 --- a/Runtime/World/CPlayerCameraBob.cpp +++ b/Runtime/World/CPlayerCameraBob.cpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { float CPlayerCameraBob::kCameraBobExtentX = 0.071f; float CPlayerCameraBob::kCameraBobExtentY = 0.142f; float CPlayerCameraBob::kCameraBobPeriod = 0.47f; @@ -226,4 +226,4 @@ void CPlayerCameraBob::ReadTweaks(CInputStream& in) { kGunBobMagnitude = in.readFloatBig(); kHelmetBobMagnitude = in.readFloatBig(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPlayerCameraBob.hpp b/Runtime/World/CPlayerCameraBob.hpp index e8561594e..9122be915 100644 --- a/Runtime/World/CPlayerCameraBob.hpp +++ b/Runtime/World/CPlayerCameraBob.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class CStateManager; class CPlayerCameraBob { @@ -103,4 +103,4 @@ public: zeus::CTransform CalculateCameraBobTransformation() const; static void ReadTweaks(CInputStream& in); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPlayerEnergyDrain.cpp b/Runtime/World/CPlayerEnergyDrain.cpp index 602217c30..d0f284d67 100644 --- a/Runtime/World/CPlayerEnergyDrain.cpp +++ b/Runtime/World/CPlayerEnergyDrain.cpp @@ -4,7 +4,7 @@ #include "Runtime/CStateManager.hpp" -namespace urde { +namespace metaforce { CPlayerEnergyDrain::CPlayerEnergyDrain(u32 numSources) { x0_sources.reserve(numSources); } @@ -35,4 +35,4 @@ void CPlayerEnergyDrain::ProcessEnergyDrain(const CStateManager& mgr, float dt) else x10_energyDrainTime += dt; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CPlayerEnergyDrain.hpp b/Runtime/World/CPlayerEnergyDrain.hpp index 403b71e2c..ab97bfe42 100644 --- a/Runtime/World/CPlayerEnergyDrain.hpp +++ b/Runtime/World/CPlayerEnergyDrain.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/World/CEnergyDrainSource.hpp" -namespace urde { +namespace metaforce { class CStateManager; class CPlayerEnergyDrain { std::vector x0_sources; @@ -20,4 +20,4 @@ public: float GetEnergyDrainTime() const { return x10_energyDrainTime; } void ProcessEnergyDrain(const CStateManager&, float); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CProjectedShadow.cpp b/Runtime/World/CProjectedShadow.cpp index 3ea0d3053..1abaabe93 100644 --- a/Runtime/World/CProjectedShadow.cpp +++ b/Runtime/World/CProjectedShadow.cpp @@ -1,6 +1,6 @@ #include "Runtime/World/CProjectedShadow.hpp" -namespace urde { +namespace metaforce { CProjectedShadow::CProjectedShadow(u32 w, u32 h, bool persistent) : x0_texture(CTexture(ETexelFormat::I4, w, h, 1)), x81_persistent(persistent) {} @@ -11,4 +11,4 @@ void CProjectedShadow::Render(const CStateManager& mgr) {} void CProjectedShadow::RenderShadowBuffer(const CStateManager&, const CModelData&, const zeus::CTransform&, s32, const zeus::CVector3f&, float, float) {} -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CProjectedShadow.hpp b/Runtime/World/CProjectedShadow.hpp index b71bc0af8..5bd8f1dd6 100644 --- a/Runtime/World/CProjectedShadow.hpp +++ b/Runtime/World/CProjectedShadow.hpp @@ -6,7 +6,7 @@ #include #include -namespace urde { +namespace metaforce { class CStateManager; class CModelData; class CProjectedShadow { @@ -30,4 +30,4 @@ public: void Unset_X80() { x80_ = false; } void Set_x98(float f) { x98_ = f; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CRepulsor.cpp b/Runtime/World/CRepulsor.cpp index 8e8145a36..44d1d44d8 100644 --- a/Runtime/World/CRepulsor.cpp +++ b/Runtime/World/CRepulsor.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CRepulsor::CRepulsor(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& info, const zeus::CVector3f& pos, float radius) : CActor(uid, active, name, info, zeus::CTransform::Translate(pos), CModelData::CModelDataNull(), CMaterialList(), @@ -16,4 +16,4 @@ void CRepulsor::Accept(IVisitor& visitor) { visitor.Visit(this); } void CRepulsor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) { CActor::AcceptScriptMsg(msg, objId, stateMgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CRepulsor.hpp b/Runtime/World/CRepulsor.hpp index 58784a52b..4c2e62c8e 100644 --- a/Runtime/World/CRepulsor.hpp +++ b/Runtime/World/CRepulsor.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CRepulsor : public CActor { float xe8_affectRadius; @@ -15,4 +15,4 @@ public: float GetAffectRadius() const { return xe8_affectRadius; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CRipple.cpp b/Runtime/World/CRipple.cpp index 22099bd4b..d24a6818c 100644 --- a/Runtime/World/CRipple.cpp +++ b/Runtime/World/CRipple.cpp @@ -2,7 +2,7 @@ #include "Runtime/CRandom16.hpp" -namespace urde { +namespace metaforce { static CRandom16 sRippleRandom(0xABBA); CRipple::CRipple(TUniqueId id, const zeus::CVector3f& center, float intensity) : x0_id(id), x8_center(center) { @@ -21,4 +21,4 @@ CRipple::CRipple(TUniqueId id, const zeus::CVector3f& center, float intensity) : x34_phase = 1.f / x30_ooPhase; x38_lookupPhase = 256.f * x34_phase; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CRipple.hpp b/Runtime/World/CRipple.hpp index 86be8c647..f9a8aa3e7 100644 --- a/Runtime/World/CRipple.hpp +++ b/Runtime/World/CRipple.hpp @@ -3,7 +3,7 @@ #include "Runtime/RetroTypes.hpp" #include -namespace urde { +namespace metaforce { class CRipple { private: TUniqueId x0_id; @@ -38,4 +38,4 @@ public: float GetPhase() const { return x34_phase; } float GetLookupPhase() const { return x38_lookupPhase; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CRippleManager.cpp b/Runtime/World/CRippleManager.cpp index c86d95a92..76bfd4304 100644 --- a/Runtime/World/CRippleManager.cpp +++ b/Runtime/World/CRippleManager.cpp @@ -1,6 +1,6 @@ #include "Runtime/World/CRippleManager.hpp" -namespace urde { +namespace metaforce { CRippleManager::CRippleManager(int maxRipples, float alpha) : x14_alpha(alpha) { Init(maxRipples); } @@ -42,4 +42,4 @@ void CRippleManager::AddRipple(const CRipple& ripple) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CRippleManager.hpp b/Runtime/World/CRippleManager.hpp index 2de208590..98c4b498a 100644 --- a/Runtime/World/CRippleManager.hpp +++ b/Runtime/World/CRippleManager.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/World/CRipple.hpp" -namespace urde { +namespace metaforce { class CRippleManager { float x0_maxTimeFalloff = 0.f; @@ -26,4 +26,4 @@ public: float GetAlpha() const { return x14_alpha; } }; -}; // namespace urde +}; // namespace metaforce diff --git a/Runtime/World/CScannableParameters.hpp b/Runtime/World/CScannableParameters.hpp index 8977a0e42..48a5f3922 100644 --- a/Runtime/World/CScannableParameters.hpp +++ b/Runtime/World/CScannableParameters.hpp @@ -2,7 +2,7 @@ #include "Runtime/RetroTypes.hpp" -namespace urde { +namespace metaforce { class CScannableParameters { CAssetId x0_scanId; @@ -12,4 +12,4 @@ public: constexpr explicit CScannableParameters(CAssetId id) : x0_scanId(id) {} [[nodiscard]] constexpr CAssetId GetScanId() const { return x0_scanId; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptActor.cpp b/Runtime/World/CScriptActor.cpp index 3152dd755..96623ac81 100644 --- a/Runtime/World/CScriptActor.cpp +++ b/Runtime/World/CScriptActor.cpp @@ -14,7 +14,7 @@ #include -namespace urde { +namespace metaforce { CScriptActor::CScriptActor(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const zeus::CAABox& aabb, float mass, float zMomentum, @@ -202,4 +202,4 @@ std::optional CScriptActor::GetTouchBounds() const { void CScriptActor::Touch(CActor&, CStateManager&) { // Empty } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptActor.hpp b/Runtime/World/CScriptActor.hpp index 624244bbc..66baaa46b 100644 --- a/Runtime/World/CScriptActor.hpp +++ b/Runtime/World/CScriptActor.hpp @@ -5,7 +5,7 @@ #include "Runtime/World/CHealthInfo.hpp" #include "Runtime/World/CPhysicsActor.hpp" -namespace urde { +namespace metaforce { class CScriptActor : public CPhysicsActor { protected: @@ -46,4 +46,4 @@ public: CHealthInfo* HealthInfo(CStateManager&) override { return &x260_currentHealth; } bool IsPlayerActor() const { return x2e3_24_isPlayerActor; } }; -}; // namespace urde +}; // namespace metaforce diff --git a/Runtime/World/CScriptActorKeyframe.cpp b/Runtime/World/CScriptActorKeyframe.cpp index 6d3b159e1..262fc047f 100644 --- a/Runtime/World/CScriptActorKeyframe.cpp +++ b/Runtime/World/CScriptActorKeyframe.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptActorKeyframe::CScriptActorKeyframe(TUniqueId uid, std::string_view name, const CEntityInfo& info, s32 animId, bool looping, float lifetime, bool isPassive, u32 fadeOut, bool active, float totalPlayback) @@ -128,4 +128,4 @@ void CScriptActorKeyframe::UpdateEntity(TUniqueId uid, CStateManager& mgr) { } } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptActorKeyframe.hpp b/Runtime/World/CScriptActorKeyframe.hpp index 017d0404b..951561f26 100644 --- a/Runtime/World/CScriptActorKeyframe.hpp +++ b/Runtime/World/CScriptActorKeyframe.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptActorKeyframe : public CEntity { private: s32 x34_animationId; @@ -30,4 +30,4 @@ public: bool IsPassive() const { return x44_25_isPassive; } void SetIsPassive(bool b) { x44_25_isPassive = b; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptActorRotate.cpp b/Runtime/World/CScriptActorRotate.cpp index 1f1333cfe..842f59e3c 100644 --- a/Runtime/World/CScriptActorRotate.cpp +++ b/Runtime/World/CScriptActorRotate.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptActorRotate::CScriptActorRotate(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CVector3f& rotation, float maxTime, bool updateActors, bool updateOnCreation, bool active) @@ -146,4 +146,4 @@ void CScriptActorRotate::UpdateSpiderBallWaypoints(CStateManager& mgr) { x58_25_skipSpiderBallWaypoints = false; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptActorRotate.hpp b/Runtime/World/CScriptActorRotate.hpp index e5a517ba0..f904143bb 100644 --- a/Runtime/World/CScriptActorRotate.hpp +++ b/Runtime/World/CScriptActorRotate.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { struct SRiders; class CScriptPlatform; class CScriptActorRotate : public CEntity { @@ -36,4 +36,4 @@ public: void Think(float, CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptAiJumpPoint.cpp b/Runtime/World/CScriptAiJumpPoint.cpp index b54961f39..034c2a276 100644 --- a/Runtime/World/CScriptAiJumpPoint.cpp +++ b/Runtime/World/CScriptAiJumpPoint.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptAiJumpPoint::CScriptAiJumpPoint(TUniqueId uid, std::string_view name, const CEntityInfo& info, zeus::CTransform& xf, bool active, float apex) : CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::NoStepLogic), @@ -50,4 +50,4 @@ bool CScriptAiJumpPoint::GetInUse(TUniqueId uid) const { return x108_24_inUse || x110_timeRemaining > 0.f || (x10a_occupant != kInvalidUniqueId && uid != kInvalidUniqueId && x10a_occupant != uid); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptAiJumpPoint.hpp b/Runtime/World/CScriptAiJumpPoint.hpp index 6e4042580..5046f8dd5 100644 --- a/Runtime/World/CScriptAiJumpPoint.hpp +++ b/Runtime/World/CScriptAiJumpPoint.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { class CScriptAiJumpPoint : public CActor { private: float xe8_apex; @@ -32,4 +32,4 @@ public: TUniqueId GetJumpTarget() const { return x10e_nextWaypoint; } float GetJumpApex() const { return xe8_apex; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptAreaAttributes.cpp b/Runtime/World/CScriptAreaAttributes.cpp index 1e9cab788..8f6f64891 100644 --- a/Runtime/World/CScriptAreaAttributes.cpp +++ b/Runtime/World/CScriptAreaAttributes.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptAreaAttributes::CScriptAreaAttributes(TUniqueId uid, const CEntityInfo& info, bool showSkybox, EEnvFxType fxType, float envFxDensity, float thermalHeat, float xrayFogDistance, @@ -44,4 +44,4 @@ void CScriptAreaAttributes::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptAreaAttributes.hpp b/Runtime/World/CScriptAreaAttributes.hpp index 0b15bc880..383449337 100644 --- a/Runtime/World/CScriptAreaAttributes.hpp +++ b/Runtime/World/CScriptAreaAttributes.hpp @@ -3,7 +3,7 @@ #include "Runtime/World/CEntity.hpp" #include "Runtime/World/CEnvFxManager.hpp" -namespace urde { +namespace metaforce { class CScriptAreaAttributes : public CEntity { bool x34_24_showSkybox : 1; EEnvFxType x38_envFx; @@ -32,4 +32,4 @@ public: float GetWorldLightingLevel() const { return x48_worldLightingLevel; } EPhazonType GetPhazonType() const { return x50_phazon; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptBallTrigger.cpp b/Runtime/World/CScriptBallTrigger.cpp index beb10f4f4..162e4ef44 100644 --- a/Runtime/World/CScriptBallTrigger.cpp +++ b/Runtime/World/CScriptBallTrigger.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { static zeus::CAABox calculate_ball_aabox() { const float extent = 0.33f * g_tweakPlayer->GetPlayerBallHalfExtent(); @@ -94,4 +94,4 @@ void CScriptBallTrigger::InhabitantExited(CActor& act, CStateManager&) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptBallTrigger.hpp b/Runtime/World/CScriptBallTrigger.hpp index aa61d4878..7bb377cac 100644 --- a/Runtime/World/CScriptBallTrigger.hpp +++ b/Runtime/World/CScriptBallTrigger.hpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { class CScriptBallTrigger : public CScriptTrigger { float x150_force; float x154_minAngle; @@ -25,4 +25,4 @@ public: void InhabitantAdded(CActor&, CStateManager&) override; void InhabitantExited(CActor&, CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptBeam.cpp b/Runtime/World/CScriptBeam.cpp index 6e7e0320b..3c3de9c6a 100644 --- a/Runtime/World/CScriptBeam.cpp +++ b/Runtime/World/CScriptBeam.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptBeam::CScriptBeam(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active, const TToken& weaponDesc, const CBeamInfo& bInfo, @@ -54,4 +54,4 @@ void CScriptBeam::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CSt CActor::AcceptScriptMsg(msg, objId, mgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptBeam.hpp b/Runtime/World/CScriptBeam.hpp index 202aab4df..924c0db79 100644 --- a/Runtime/World/CScriptBeam.hpp +++ b/Runtime/World/CScriptBeam.hpp @@ -6,7 +6,7 @@ #include "Runtime/World/CActor.hpp" #include "Runtime/World/CDamageInfo.hpp" -namespace urde { +namespace metaforce { class CWeaponDescription; class CScriptBeam : public CActor { TCachedToken xe8_weaponDescription; @@ -22,4 +22,4 @@ public: void Think(float, CStateManager&) override; void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraBlurKeyframe.cpp b/Runtime/World/CScriptCameraBlurKeyframe.cpp index 51298cdff..7240d4eec 100644 --- a/Runtime/World/CScriptCameraBlurKeyframe.cpp +++ b/Runtime/World/CScriptCameraBlurKeyframe.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptCameraBlurKeyframe::CScriptCameraBlurKeyframe(TUniqueId uid, std::string_view name, const CEntityInfo& info, EBlurType type, float amount, u32 unk, float timeIn, float timeOut, bool active) @@ -36,4 +36,4 @@ void CScriptCameraBlurKeyframe::AcceptScriptMsg(EScriptObjectMessage msg, TUniqu void CScriptCameraBlurKeyframe::Accept(IVisitor& visitor) { visitor.Visit(this); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraBlurKeyframe.hpp b/Runtime/World/CScriptCameraBlurKeyframe.hpp index 2916bd382..672350d04 100644 --- a/Runtime/World/CScriptCameraBlurKeyframe.hpp +++ b/Runtime/World/CScriptCameraBlurKeyframe.hpp @@ -6,7 +6,7 @@ #include "Runtime/Camera/CCameraFilter.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptCameraBlurKeyframe : public CEntity { EBlurType x34_type; float x38_amount; @@ -21,4 +21,4 @@ public: void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; void Accept(IVisitor& visitor) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraFilterKeyframe.cpp b/Runtime/World/CScriptCameraFilterKeyframe.cpp index 14aa52213..2c7397ab8 100644 --- a/Runtime/World/CScriptCameraFilterKeyframe.cpp +++ b/Runtime/World/CScriptCameraFilterKeyframe.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptCameraFilterKeyframe::CScriptCameraFilterKeyframe(TUniqueId uid, std::string_view name, const CEntityInfo& info, EFilterType type, EFilterShape shape, u32 filterIdx, u32 unk, const zeus::CColor& color, float timeIn, float timeOut, @@ -45,4 +45,4 @@ void CScriptCameraFilterKeyframe::AcceptScriptMsg(EScriptObjectMessage msg, TUni void CScriptCameraFilterKeyframe::Accept(IVisitor& visitor) { visitor.Visit(this); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraFilterKeyframe.hpp b/Runtime/World/CScriptCameraFilterKeyframe.hpp index 96e050142..d5f82b3f1 100644 --- a/Runtime/World/CScriptCameraFilterKeyframe.hpp +++ b/Runtime/World/CScriptCameraFilterKeyframe.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CScriptCameraFilterKeyframe : public CEntity { EFilterType x34_type; EFilterShape x38_shape; @@ -27,4 +27,4 @@ public: void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; void Accept(IVisitor& visitor) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraHint.cpp b/Runtime/World/CScriptCameraHint.cpp index 2ff3b5788..6c5a60887 100644 --- a/Runtime/World/CScriptCameraHint.cpp +++ b/Runtime/World/CScriptCameraHint.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptCameraHint::CScriptCameraHint(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active, s32 priority, @@ -130,4 +130,4 @@ void CScriptCameraHint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId send CActor::AcceptScriptMsg(msg, sender, mgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraHint.hpp b/Runtime/World/CScriptCameraHint.hpp index 3826497da..3b3119e6f 100644 --- a/Runtime/World/CScriptCameraHint.hpp +++ b/Runtime/World/CScriptCameraHint.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { class CCameraHint { u32 x4_overrideFlags; @@ -110,4 +110,4 @@ public: TUniqueId GetDelegatedCamera() const { return x164_delegatedCamera; } const zeus::CTransform& GetOriginalTransform() const { return x168_origXf; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraHintTrigger.cpp b/Runtime/World/CScriptCameraHintTrigger.cpp index 16345ea11..646329a85 100644 --- a/Runtime/World/CScriptCameraHintTrigger.cpp +++ b/Runtime/World/CScriptCameraHintTrigger.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptCameraHintTrigger::CScriptCameraHintTrigger(TUniqueId uid, bool active, std::string_view name, const CEntityInfo& info, const zeus::CVector3f& scale, @@ -60,4 +60,4 @@ std::optional CScriptCameraHintTrigger::GetTouchBounds() const { return {xe8_obb.calculateAABox()}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraHintTrigger.hpp b/Runtime/World/CScriptCameraHintTrigger.hpp index 5001c43ce..63f03050f 100644 --- a/Runtime/World/CScriptCameraHintTrigger.hpp +++ b/Runtime/World/CScriptCameraHintTrigger.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class CScriptCameraHintTrigger : public CActor { zeus::COBBox xe8_obb; zeus::CVector3f x124_scale; @@ -28,4 +28,4 @@ public: void Touch(CActor& other, CStateManager& mgr) override; std::optional GetTouchBounds() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraPitchVolume.cpp b/Runtime/World/CScriptCameraPitchVolume.cpp index 71454cdb3..7fd1c0e79 100644 --- a/Runtime/World/CScriptCameraPitchVolume.cpp +++ b/Runtime/World/CScriptCameraPitchVolume.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { const zeus::CVector3f CScriptCameraPitchVolume::skScaleFactor = zeus::CVector3f(0.5f); CScriptCameraPitchVolume::CScriptCameraPitchVolume(TUniqueId uid, bool active, std::string_view name, @@ -58,7 +58,7 @@ void CScriptCameraPitchVolume::Touch(CActor& act, CStateManager& mgr) { x13c_24_entered = xe8_obbox.AABoxIntersectsBox(plBox.value()); } -void CScriptCameraPitchVolume::Entered(urde::CStateManager& mgr) { +void CScriptCameraPitchVolume::Entered(metaforce::CStateManager& mgr) { x13c_25_occupied = true; mgr.GetCameraManager()->GetFirstPersonCamera()->SetScriptPitchId(GetUniqueId()); } @@ -67,4 +67,4 @@ void CScriptCameraPitchVolume::Exited(CStateManager& mgr) { x13c_25_occupied = false; mgr.GetCameraManager()->GetFirstPersonCamera()->SetScriptPitchId(kInvalidUniqueId); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraPitchVolume.hpp b/Runtime/World/CScriptCameraPitchVolume.hpp index cb92f95da..094b7d6fc 100644 --- a/Runtime/World/CScriptCameraPitchVolume.hpp +++ b/Runtime/World/CScriptCameraPitchVolume.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CScriptCameraPitchVolume : public CActor { static const zeus::CVector3f skScaleFactor; zeus::COBBox xe8_obbox; @@ -35,4 +35,4 @@ public: void Entered(CStateManager&); void Exited(CStateManager&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraShaker.cpp b/Runtime/World/CScriptCameraShaker.cpp index 71aed95da..7717d5828 100644 --- a/Runtime/World/CScriptCameraShaker.cpp +++ b/Runtime/World/CScriptCameraShaker.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptCameraShaker::CScriptCameraShaker(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active, const CCameraShakeData& shakeData) @@ -38,4 +38,4 @@ void CScriptCameraShaker::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId ob CEntity::AcceptScriptMsg(msg, objId, stateMgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraShaker.hpp b/Runtime/World/CScriptCameraShaker.hpp index 0c6404201..18df3237f 100644 --- a/Runtime/World/CScriptCameraShaker.hpp +++ b/Runtime/World/CScriptCameraShaker.hpp @@ -5,7 +5,7 @@ #include "Runtime/Camera/CCameraShakeData.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptCameraShaker : public CEntity { CCameraShakeData x34_shakeData; @@ -17,4 +17,4 @@ public: void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraWaypoint.cpp b/Runtime/World/CScriptCameraWaypoint.cpp index 4ead129db..551ca7486 100644 --- a/Runtime/World/CScriptCameraWaypoint.cpp +++ b/Runtime/World/CScriptCameraWaypoint.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptCameraWaypoint::CScriptCameraWaypoint(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active, float hfov, u32 w1) @@ -39,4 +39,4 @@ TUniqueId CScriptCameraWaypoint::GetRandomNextWaypointId(CStateManager& mgr) con return candidateIds[mgr.GetActiveRandom()->Range(0, s32(candidateIds.size() - 1))]; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCameraWaypoint.hpp b/Runtime/World/CScriptCameraWaypoint.hpp index 014037d73..f76e6a2cb 100644 --- a/Runtime/World/CScriptCameraWaypoint.hpp +++ b/Runtime/World/CScriptCameraWaypoint.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CScriptCameraWaypoint : public CActor { float xe8_hfov; @@ -23,4 +23,4 @@ public: float GetHFov() const { return xe8_hfov; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptColorModulate.cpp b/Runtime/World/CScriptColorModulate.cpp index 2a87c61ee..e1e2f3951 100644 --- a/Runtime/World/CScriptColorModulate.cpp +++ b/Runtime/World/CScriptColorModulate.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptColorModulate::CScriptColorModulate(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CColor& colorA, const zeus::CColor& colorB, EBlendMode blendMode, float timeA2B, float timeB2A, bool doReverse, bool resetTargetWhenDone, @@ -272,4 +272,4 @@ void CScriptColorModulate::End(CStateManager& stateMgr) { stateMgr.FreeScriptObject(GetUniqueId()); } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptColorModulate.hpp b/Runtime/World/CScriptColorModulate.hpp index 58b1c17db..700cd7c6c 100644 --- a/Runtime/World/CScriptColorModulate.hpp +++ b/Runtime/World/CScriptColorModulate.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { struct CModelFlags; class CScriptColorModulate : public CEntity { @@ -54,4 +54,4 @@ public: static TUniqueId FadeInHelper(CStateManager& mgr, TUniqueId obj, float fadetime); void End(CStateManager&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptControllerAction.cpp b/Runtime/World/CScriptControllerAction.cpp index 6c834f7fa..2be11cedf 100644 --- a/Runtime/World/CScriptControllerAction.cpp +++ b/Runtime/World/CScriptControllerAction.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptControllerAction::CScriptControllerAction(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active, ControlMapper::ECommands command, bool mapScreenResponse, @@ -40,4 +40,4 @@ void CScriptControllerAction::Think(float, CStateManager& stateMgr) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptControllerAction.hpp b/Runtime/World/CScriptControllerAction.hpp index 63351a2e9..0290932b7 100644 --- a/Runtime/World/CScriptControllerAction.hpp +++ b/Runtime/World/CScriptControllerAction.hpp @@ -6,7 +6,7 @@ #include "Runtime/Input/ControlMapper.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptControllerAction : public CEntity { ControlMapper::ECommands x34_command; @@ -22,4 +22,4 @@ public: void Think(float, CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCounter.cpp b/Runtime/World/CScriptCounter.cpp index 01fbb569c..a3d0e9420 100644 --- a/Runtime/World/CScriptCounter.cpp +++ b/Runtime/World/CScriptCounter.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptCounter::CScriptCounter(TUniqueId uid, std::string_view name, const CEntityInfo& info, s32 initial, s32 max, bool autoReset, bool active) @@ -67,4 +67,4 @@ void CScriptCounter::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CEntity::AcceptScriptMsg(msg, objId, stateMgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCounter.hpp b/Runtime/World/CScriptCounter.hpp index 95ddd2e5d..aa480e9e1 100644 --- a/Runtime/World/CScriptCounter.hpp +++ b/Runtime/World/CScriptCounter.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptCounter : public CEntity { s32 x34_initial; @@ -20,4 +20,4 @@ public: void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCoverPoint.cpp b/Runtime/World/CScriptCoverPoint.cpp index 398a4f6c4..f5210d578 100644 --- a/Runtime/World/CScriptCoverPoint.cpp +++ b/Runtime/World/CScriptCoverPoint.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptCoverPoint::CScriptCoverPoint(TUniqueId uid, std::string_view name, const CEntityInfo& info, zeus::CTransform xf, bool active, u32 flags, bool crouch, float horizontalAngle, float verticalAngle, float coverTime) @@ -84,4 +84,4 @@ void CScriptCoverPoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptCoverPoint.hpp b/Runtime/World/CScriptCoverPoint.hpp index a772e6d1a..ccaade702 100644 --- a/Runtime/World/CScriptCoverPoint.hpp +++ b/Runtime/World/CScriptCoverPoint.hpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { class CScriptCoverPoint : public CActor { bool xe8_26_landHere : 1; bool xe8_27_wallHang : 1; @@ -50,4 +50,4 @@ public: } void Reserve(TUniqueId id) { xfa_occupant = id; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDamageableTrigger.cpp b/Runtime/World/CScriptDamageableTrigger.cpp index d745042a6..07bd9e407 100644 --- a/Runtime/World/CScriptDamageableTrigger.cpp +++ b/Runtime/World/CScriptDamageableTrigger.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { static CActorParameters MakeDamageableTriggerActorParms(const CActorParameters& aParams, const CVisorParameters& vParams) { CActorParameters ret = aParams; ret.SetVisorParameters(vParams); @@ -215,4 +215,4 @@ std::optional CScriptDamageableTrigger::GetTouchBounds() const { return std::nullopt; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDamageableTrigger.hpp b/Runtime/World/CScriptDamageableTrigger.hpp index 350611475..fd13900e9 100644 --- a/Runtime/World/CScriptDamageableTrigger.hpp +++ b/Runtime/World/CScriptDamageableTrigger.hpp @@ -13,7 +13,7 @@ #include #include -namespace urde { +namespace metaforce { class CVisorParameters; class CScriptDamageableTrigger : public CActor { @@ -62,4 +62,4 @@ public: void Think(float, CStateManager&) override; std::optional GetTouchBounds() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDebris.cpp b/Runtime/World/CScriptDebris.cpp index f724dd40f..5570c047a 100644 --- a/Runtime/World/CScriptDebris.cpp +++ b/Runtime/World/CScriptDebris.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptDebris::CScriptDebris(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CActorParameters& aParams, CAssetId particleId, @@ -414,4 +414,4 @@ void CScriptDebris::CollidedWith(TUniqueId, const CCollisionInfoList& colList, C } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDebris.hpp b/Runtime/World/CScriptDebris.hpp index 9d44ee853..937841c3b 100644 --- a/Runtime/World/CScriptDebris.hpp +++ b/Runtime/World/CScriptDebris.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { class CElementGen; class CScriptDebris : public CPhysicsActor { public: @@ -84,4 +84,4 @@ public: void CollidedWith(TUniqueId uid, const CCollisionInfoList&, CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDebugCameraWaypoint.cpp b/Runtime/World/CScriptDebugCameraWaypoint.cpp index 47f488e3d..486f9db34 100644 --- a/Runtime/World/CScriptDebugCameraWaypoint.cpp +++ b/Runtime/World/CScriptDebugCameraWaypoint.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptDebugCameraWaypoint::CScriptDebugCameraWaypoint(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, u32 w1) @@ -14,4 +14,4 @@ CScriptDebugCameraWaypoint::CScriptDebugCameraWaypoint(TUniqueId uid, std::strin void CScriptDebugCameraWaypoint::Accept(IVisitor& visitor) { visitor.Visit(this); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDebugCameraWaypoint.hpp b/Runtime/World/CScriptDebugCameraWaypoint.hpp index 75e9242d6..538c648a4 100644 --- a/Runtime/World/CScriptDebugCameraWaypoint.hpp +++ b/Runtime/World/CScriptDebugCameraWaypoint.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CScriptDebugCameraWaypoint : public CActor { u32 xe8_w1; @@ -17,4 +17,4 @@ public: void Accept(IVisitor&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDistanceFog.cpp b/Runtime/World/CScriptDistanceFog.cpp index 7e2c9ee6b..8606dcf62 100644 --- a/Runtime/World/CScriptDistanceFog.cpp +++ b/Runtime/World/CScriptDistanceFog.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptDistanceFog::CScriptDistanceFog(TUniqueId uid, std::string_view name, const CEntityInfo& info, ERglFogMode mode, const zeus::CColor& color, const zeus::CVector2f& range, float colorDelta, const zeus::CVector2f& rangeDelta, bool expl, bool active, float thermalTarget, @@ -71,4 +71,4 @@ void CScriptDistanceFog::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId obj } } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDistanceFog.hpp b/Runtime/World/CScriptDistanceFog.hpp index 0a58dc5c0..ae967c4b1 100644 --- a/Runtime/World/CScriptDistanceFog.hpp +++ b/Runtime/World/CScriptDistanceFog.hpp @@ -8,7 +8,7 @@ #include #include -namespace urde { +namespace metaforce { class CScriptDistanceFog : public CEntity { ERglFogMode x34_mode; zeus::CColor x38_color; @@ -29,4 +29,4 @@ public: void Accept(IVisitor& visitor) override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDock.cpp b/Runtime/World/CScriptDock.cpp index 0c3d3c6fe..2e8435bef 100644 --- a/Runtime/World/CScriptDock.cpp +++ b/Runtime/World/CScriptDock.cpp @@ -11,7 +11,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { constexpr auto skDockMaterialList = CMaterialList{EMaterialTypes::Trigger, EMaterialTypes::Immovable, EMaterialTypes::AIBlock}; @@ -236,4 +236,4 @@ void CScriptDock::SetLoadConnected(CStateManager& mgr, bool loadOther) { dock->SetShouldLoadOther(dock->GetReferenceCount(), loadOther); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDock.hpp b/Runtime/World/CScriptDock.hpp index dda19d112..083f85fb1 100644 --- a/Runtime/World/CScriptDock.hpp +++ b/Runtime/World/CScriptDock.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CPhysicsActor.hpp" -namespace urde { +namespace metaforce { class CScriptDock : public CPhysicsActor { enum class EDockState { Idle, PlayerTouched, EnterNextArea, Three }; @@ -42,4 +42,4 @@ public: void AreaUnloaded(CStateManager&); void SetLoadConnected(CStateManager&, bool); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDockAreaChange.cpp b/Runtime/World/CScriptDockAreaChange.cpp index b40b26ba4..62deef920 100644 --- a/Runtime/World/CScriptDockAreaChange.cpp +++ b/Runtime/World/CScriptDockAreaChange.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptDockAreaChange::CScriptDockAreaChange(TUniqueId uid, std::string_view name, const CEntityInfo& info, s32 w1, bool active) : CEntity(uid, info, active, name), x34_dockReference(w1) {} @@ -34,4 +34,4 @@ void CScriptDockAreaChange::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId CEntity::AcceptScriptMsg(msg, objId, stateMgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDockAreaChange.hpp b/Runtime/World/CScriptDockAreaChange.hpp index 0e6c07610..9a798399a 100644 --- a/Runtime/World/CScriptDockAreaChange.hpp +++ b/Runtime/World/CScriptDockAreaChange.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptDockAreaChange : public CEntity { s32 x34_dockReference; @@ -15,4 +15,4 @@ public: void Accept(IVisitor& visitor) override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDoor.cpp b/Runtime/World/CScriptDoor.cpp index 78384e62b..cd801102f 100644 --- a/Runtime/World/CScriptDoor.cpp +++ b/Runtime/World/CScriptDoor.cpp @@ -12,7 +12,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { static CMaterialList MakeDoorMaterialList(bool open) { CMaterialList ret; @@ -410,4 +410,4 @@ std::optional CScriptDoor::GetProjectileBounds() const { return std::nullopt; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptDoor.hpp b/Runtime/World/CScriptDoor.hpp index 0f0ef087b..2b49ffc61 100644 --- a/Runtime/World/CScriptDoor.hpp +++ b/Runtime/World/CScriptDoor.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CScriptDoor : public CPhysicsActor { public: @@ -63,4 +63,4 @@ public: bool IsOpen() const { return x2a8_26_isOpen; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptEMPulse.cpp b/Runtime/World/CScriptEMPulse.cpp index 4ef92348b..2180219ca 100644 --- a/Runtime/World/CScriptEMPulse.cpp +++ b/Runtime/World/CScriptEMPulse.cpp @@ -11,7 +11,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptEMPulse::CScriptEMPulse(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active, float initialRadius, float finalRadius, @@ -97,4 +97,4 @@ zeus::CAABox CScriptEMPulse::CalculateBoundingBox() const { return zeus::CAABox(GetTranslation() - xf0_currentRadius, GetTranslation() + xf0_currentRadius); } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/World/CScriptEMPulse.hpp b/Runtime/World/CScriptEMPulse.hpp index 4a3bcbcab..d1545d343 100644 --- a/Runtime/World/CScriptEMPulse.hpp +++ b/Runtime/World/CScriptEMPulse.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CElementGen; class CGenDescription; @@ -32,4 +32,4 @@ public: std::optional GetTouchBounds() const override; void Touch(CActor&, CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptEffect.cpp b/Runtime/World/CScriptEffect.cpp index de1c7ec3e..eb69f62a3 100644 --- a/Runtime/World/CScriptEffect.cpp +++ b/Runtime/World/CScriptEffect.cpp @@ -16,7 +16,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { u32 CScriptEffect::g_NumParticlesUpdating = 0; u32 CScriptEffect::g_NumParticlesRendered = 0; @@ -384,4 +384,4 @@ bool CScriptEffect::AreBothSystemsDeleteable() const { return true; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptEffect.hpp b/Runtime/World/CScriptEffect.hpp index 25397d0ae..c7bf07111 100644 --- a/Runtime/World/CScriptEffect.hpp +++ b/Runtime/World/CScriptEffect.hpp @@ -6,7 +6,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CElementGen; class CParticleElectric; @@ -72,4 +72,4 @@ public: } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptGenerator.cpp b/Runtime/World/CScriptGenerator.cpp index 5311f7222..e58b743fd 100644 --- a/Runtime/World/CScriptGenerator.cpp +++ b/Runtime/World/CScriptGenerator.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptGenerator::CScriptGenerator(TUniqueId uid, std::string_view name, const CEntityInfo& info, u32 spawnCount, bool noReuseFollowers, const zeus::CVector3f& vec1, bool noInheritXf, bool active, @@ -139,4 +139,4 @@ void CScriptGenerator::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sende CEntity::AcceptScriptMsg(msg, sender, stateMgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptGenerator.hpp b/Runtime/World/CScriptGenerator.hpp index 76b154b20..90c0a3eff 100644 --- a/Runtime/World/CScriptGenerator.hpp +++ b/Runtime/World/CScriptGenerator.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { class CScriptGenerator : public CEntity { u32 x34_spawnCount; @@ -24,4 +24,4 @@ public: void Accept(IVisitor& visitor) override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptGrapplePoint.cpp b/Runtime/World/CScriptGrapplePoint.cpp index 7d96927c4..639f7bd53 100644 --- a/Runtime/World/CScriptGrapplePoint.cpp +++ b/Runtime/World/CScriptGrapplePoint.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptGrapplePoint::CScriptGrapplePoint(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& transform, bool active, const CGrappleParameters& params) @@ -50,4 +50,4 @@ void CScriptGrapplePoint::AddToRenderer(const zeus::CFrustum&, CStateManager& mg CActor::EnsureRendered(mgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptGrapplePoint.hpp b/Runtime/World/CScriptGrapplePoint.hpp index eb67176f5..3547b4b94 100644 --- a/Runtime/World/CScriptGrapplePoint.hpp +++ b/Runtime/World/CScriptGrapplePoint.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { class CScriptGrapplePoint : public CActor { zeus::CAABox xe8_touchBounds; CGrappleParameters x100_parameters; @@ -24,4 +24,4 @@ public: void AddToRenderer(const zeus::CFrustum&, CStateManager&) override; const CGrappleParameters& GetGrappleParameters() const { return x100_parameters; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptGunTurret.cpp b/Runtime/World/CScriptGunTurret.cpp index 5148e1ce0..c3938bb6b 100644 --- a/Runtime/World/CScriptGunTurret.cpp +++ b/Runtime/World/CScriptGunTurret.cpp @@ -18,7 +18,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { namespace { constexpr CMaterialList skGunMaterialList = {EMaterialTypes::Solid, EMaterialTypes::Character, EMaterialTypes::Orbit, EMaterialTypes::Target}; @@ -1306,4 +1306,4 @@ bool CScriptGunTurret::IsInsignificantRotation(float dt) const { zeus::degToRad(2.f) * dt; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptGunTurret.hpp b/Runtime/World/CScriptGunTurret.hpp index 65bc8097c..9a4dc7824 100644 --- a/Runtime/World/CScriptGunTurret.hpp +++ b/Runtime/World/CScriptGunTurret.hpp @@ -13,7 +13,7 @@ #include #include -namespace urde { +namespace metaforce { class CCollisionActorManager; class CElementGen; @@ -231,4 +231,4 @@ public: CHealthInfo* HealthInfo(CStateManager&) override { return &x264_healthInfo; } const CDamageVulnerability* GetDamageVulnerability() const override { return &x26c_damageVuln; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptHUDMemo.cpp b/Runtime/World/CScriptHUDMemo.cpp index 76ca45762..1feadb2f1 100644 --- a/Runtime/World/CScriptHUDMemo.cpp +++ b/Runtime/World/CScriptHUDMemo.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptHUDMemo::CScriptHUDMemo(TUniqueId uid, std::string_view name, const CEntityInfo& info, const CHUDMemoParms& parms, EDisplayType disp, CAssetId msg, bool active) @@ -39,4 +39,4 @@ void CScriptHUDMemo::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CS CEntity::AcceptScriptMsg(msg, uid, mgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptHUDMemo.hpp b/Runtime/World/CScriptHUDMemo.hpp index 75949946a..f0a44af59 100644 --- a/Runtime/World/CScriptHUDMemo.hpp +++ b/Runtime/World/CScriptHUDMemo.hpp @@ -8,7 +8,7 @@ #include "Runtime/World/CEntity.hpp" #include "Runtime/World/CHUDMemoParms.hpp" -namespace urde { +namespace metaforce { class CScriptHUDMemo : public CEntity { public: @@ -29,4 +29,4 @@ public: void Accept(IVisitor& visitor) override; void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptMazeNode.cpp b/Runtime/World/CScriptMazeNode.cpp index c2a8b4b39..2502d9662 100644 --- a/Runtime/World/CScriptMazeNode.cpp +++ b/Runtime/World/CScriptMazeNode.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { std::array sMazeSeeds; @@ -477,4 +477,4 @@ void CMazeState::DebugRender() { } m_renderer.Render(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptMazeNode.hpp b/Runtime/World/CScriptMazeNode.hpp index e5f6a5a2b..b70c9fa42 100644 --- a/Runtime/World/CScriptMazeNode.hpp +++ b/Runtime/World/CScriptMazeNode.hpp @@ -11,7 +11,7 @@ #include -namespace urde { +namespace metaforce { constexpr s32 skMazeCols = 9; constexpr s32 skMazeRows = 7; constexpr s32 skEnterCol = 4; @@ -114,4 +114,4 @@ private: void Reset(CStateManager& mgr); void SendScriptMsgs(CStateManager& mgr, EScriptObjectMessage msg); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptMemoryRelay.cpp b/Runtime/World/CScriptMemoryRelay.cpp index ff706c7e9..44909e364 100644 --- a/Runtime/World/CScriptMemoryRelay.cpp +++ b/Runtime/World/CScriptMemoryRelay.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptMemoryRelay::CScriptMemoryRelay(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool defaultActive, bool skipSendActive, bool ignoreMessages) @@ -36,4 +36,4 @@ void CScriptMemoryRelay::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId obj CEntity::AcceptScriptMsg(msg, objId, stateMgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptMemoryRelay.hpp b/Runtime/World/CScriptMemoryRelay.hpp index 2f0b31c64..05935d28a 100644 --- a/Runtime/World/CScriptMemoryRelay.hpp +++ b/Runtime/World/CScriptMemoryRelay.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptMemoryRelay : public CEntity { bool x34_24_defaultActive; bool x34_25_skipSendActive; @@ -16,4 +16,4 @@ public: void Accept(IVisitor& visitor) override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptMidi.cpp b/Runtime/World/CScriptMidi.cpp index 35c267076..00b23486a 100644 --- a/Runtime/World/CScriptMidi.cpp +++ b/Runtime/World/CScriptMidi.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptMidi::CScriptMidi(TUniqueId id, const CEntityInfo& info, std::string_view name, bool active, CAssetId csng, float fadeIn, float fadeOut, s32 volume) @@ -77,4 +77,4 @@ void CScriptMidi::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CSt } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptMidi.hpp b/Runtime/World/CScriptMidi.hpp index 296d0682f..efeb77e30 100644 --- a/Runtime/World/CScriptMidi.hpp +++ b/Runtime/World/CScriptMidi.hpp @@ -7,7 +7,7 @@ #include "Runtime/Audio/CMidiManager.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptMidi : public CEntity { TToken x34_song; @@ -28,4 +28,4 @@ public: void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPickup.cpp b/Runtime/World/CScriptPickup.cpp index b09cb98df..ab846fd3b 100644 --- a/Runtime/World/CScriptPickup.cpp +++ b/Runtime/World/CScriptPickup.cpp @@ -15,7 +15,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptPickup::CScriptPickup(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CModelData&& mData, const CActorParameters& aParams, const zeus::CAABox& aabb, CPlayerState::EItemType itemType, s32 amount, s32 capacity, CAssetId pickupEffect, @@ -172,4 +172,4 @@ void CScriptPickup::Touch(CActor& act, CStateManager& mgr) { } } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPickup.hpp b/Runtime/World/CScriptPickup.hpp index db5b0a8be..52f26e27b 100644 --- a/Runtime/World/CScriptPickup.hpp +++ b/Runtime/World/CScriptPickup.hpp @@ -6,7 +6,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/World/CPhysicsActor.hpp" -namespace urde { +namespace metaforce { class CScriptPickup : public CPhysicsActor { CPlayerState::EItemType x258_itemType; s32 x25c_amount; @@ -37,4 +37,4 @@ public: CPlayerState::EItemType GetItem() const { return x258_itemType; } void SetGenerated() { x28c_24_generated = true; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPickupGenerator.cpp b/Runtime/World/CScriptPickupGenerator.cpp index 55e8be35b..77e9f7265 100644 --- a/Runtime/World/CScriptPickupGenerator.cpp +++ b/Runtime/World/CScriptPickupGenerator.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptPickupGenerator::CScriptPickupGenerator(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CVector3f& pos, float frequency, bool active) @@ -176,4 +176,4 @@ void CScriptPickupGenerator::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId CEntity::AcceptScriptMsg(msg, sender, stateMgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPickupGenerator.hpp b/Runtime/World/CScriptPickupGenerator.hpp index b05e23a3b..f42810eb1 100644 --- a/Runtime/World/CScriptPickupGenerator.hpp +++ b/Runtime/World/CScriptPickupGenerator.hpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { class CScriptPickupGenerator : public CEntity { zeus::CVector3f x34_position; float x40_frequency; @@ -22,4 +22,4 @@ public: void Accept(IVisitor& visitor) override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& stateMgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPlatform.cpp b/Runtime/World/CScriptPlatform.cpp index 9cfeff8da..ad7640b70 100644 --- a/Runtime/World/CScriptPlatform.cpp +++ b/Runtime/World/CScriptPlatform.cpp @@ -16,7 +16,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { constexpr auto skPlatformMaterialList = CMaterialList{EMaterialTypes::Solid, EMaterialTypes::Immovable, EMaterialTypes::Platform, EMaterialTypes::Occluder}; @@ -568,4 +568,4 @@ void CScriptPlatform::DebugDraw() { m_boxFilter->setAABB(*GetTouchBounds()); m_boxFilter->draw({1.f, 0.f, 1.f, .5f}); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPlatform.hpp b/Runtime/World/CScriptPlatform.hpp index fad6da894..aaf44c803 100644 --- a/Runtime/World/CScriptPlatform.hpp +++ b/Runtime/World/CScriptPlatform.hpp @@ -18,7 +18,7 @@ #include #include -namespace urde { +namespace metaforce { class CFluidPlane; struct SRiders { @@ -119,4 +119,4 @@ public: void DebugDraw(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPlayerActor.cpp b/Runtime/World/CScriptPlayerActor.cpp index f37ffa92e..c917fad35 100644 --- a/Runtime/World/CScriptPlayerActor.cpp +++ b/Runtime/World/CScriptPlayerActor.cpp @@ -14,7 +14,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptPlayerActor::CScriptPlayerActor(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, const CAnimRes& animRes, CModelData&& mData, const zeus::CAABox& aabox, bool setBoundingBox, const CMaterialList& list, @@ -463,4 +463,4 @@ void CScriptPlayerActor::TouchModels(const CStateManager& mgr) const { } } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPlayerActor.hpp b/Runtime/World/CScriptPlayerActor.hpp index c40d359d7..bb71f8633 100644 --- a/Runtime/World/CScriptPlayerActor.hpp +++ b/Runtime/World/CScriptPlayerActor.hpp @@ -7,7 +7,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/World/CScriptActor.hpp" -namespace urde { +namespace metaforce { class CScriptPlayerActor : public CScriptActor { CAnimRes x2e8_suitRes; CPlayerState::EBeamId x304_beam; @@ -66,4 +66,4 @@ public: void Render(CStateManager& mgr) override; void TouchModels(const CStateManager& mgr) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPlayerHint.cpp b/Runtime/World/CScriptPlayerHint.cpp index ee8faf6ac..62906076f 100644 --- a/Runtime/World/CScriptPlayerHint.cpp +++ b/Runtime/World/CScriptPlayerHint.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptPlayerHint::CScriptPlayerHint(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active, u32 priority, u32 overrideFlags) @@ -91,4 +91,4 @@ void CScriptPlayerHint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId send CActor::AcceptScriptMsg(msg, sender, mgr); } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/World/CScriptPlayerHint.hpp b/Runtime/World/CScriptPlayerHint.hpp index 878148aad..10be641fc 100644 --- a/Runtime/World/CScriptPlayerHint.hpp +++ b/Runtime/World/CScriptPlayerHint.hpp @@ -6,7 +6,7 @@ #include "Runtime/rstl.hpp" #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CScriptPlayerHint : public CActor { rstl::reserved_vector xe8_objectList; @@ -29,4 +29,4 @@ public: void SetDeactivated() { xfc_deactivated = true; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPlayerStateChange.cpp b/Runtime/World/CScriptPlayerStateChange.cpp index 056eb2b5a..a9b163716 100644 --- a/Runtime/World/CScriptPlayerStateChange.cpp +++ b/Runtime/World/CScriptPlayerStateChange.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptPlayerStateChange::CScriptPlayerStateChange(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active, u32 itemType, u32 itemCount, u32 itemCapacity, EControl control, EControlCommandOption controlCmdOpt) @@ -40,4 +40,4 @@ void CScriptPlayerStateChange::AcceptScriptMsg(EScriptObjectMessage msg, TUnique CEntity::AcceptScriptMsg(msg, objId, stateMgr); } -} // namespace urde \ No newline at end of file +} // namespace metaforce \ No newline at end of file diff --git a/Runtime/World/CScriptPlayerStateChange.hpp b/Runtime/World/CScriptPlayerStateChange.hpp index d8f297460..539679e2c 100644 --- a/Runtime/World/CScriptPlayerStateChange.hpp +++ b/Runtime/World/CScriptPlayerStateChange.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptPlayerStateChange : public CEntity { public: enum class EControl { Unfiltered, Filtered }; @@ -24,4 +24,4 @@ public: void Accept(IVisitor& visit) override; void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPointOfInterest.cpp b/Runtime/World/CScriptPointOfInterest.cpp index 8b0c09704..1acf88568 100644 --- a/Runtime/World/CScriptPointOfInterest.cpp +++ b/Runtime/World/CScriptPointOfInterest.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptPointOfInterest::CScriptPointOfInterest(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active, @@ -41,4 +41,4 @@ void CScriptPointOfInterest::CalculateRenderBounds() { std::optional CScriptPointOfInterest::GetTouchBounds() const { return {zeus::CAABox{x34_transform.origin, x34_transform.origin}}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptPointOfInterest.hpp b/Runtime/World/CScriptPointOfInterest.hpp index e7bb74eb5..e7ebcdda0 100644 --- a/Runtime/World/CScriptPointOfInterest.hpp +++ b/Runtime/World/CScriptPointOfInterest.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CScannableParameters; class CScriptPointOfInterest : public CActor { @@ -22,4 +22,4 @@ public: void CalculateRenderBounds() override; std::optional GetTouchBounds() const override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptRandomRelay.cpp b/Runtime/World/CScriptRandomRelay.cpp index ee3c20564..95f547355 100644 --- a/Runtime/World/CScriptRandomRelay.cpp +++ b/Runtime/World/CScriptRandomRelay.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptRandomRelay::CScriptRandomRelay(TUniqueId uid, std::string_view name, const CEntityInfo& info, s32 sendSetSize, s32 sendSetVariance, bool percentSize, bool active) : CEntity(uid, info, active, name) @@ -67,4 +67,4 @@ void CScriptRandomRelay::SendLocalScriptMsgs(EScriptObjectState state, CStateMan stateMgr.SendScriptMsg(o.first, GetUniqueId(), o.second); } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptRandomRelay.hpp b/Runtime/World/CScriptRandomRelay.hpp index 6a4f9c8c8..f5a69deba 100644 --- a/Runtime/World/CScriptRandomRelay.hpp +++ b/Runtime/World/CScriptRandomRelay.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptRandomRelay : public CEntity { s32 x34_sendSetSize; s32 x38_sendSetVariance; @@ -19,4 +19,4 @@ public: void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; void SendLocalScriptMsgs(EScriptObjectState state, CStateManager& stateMgr); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptRelay.cpp b/Runtime/World/CScriptRelay.cpp index a4e4dad98..cdeab93df 100644 --- a/Runtime/World/CScriptRelay.cpp +++ b/Runtime/World/CScriptRelay.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptRelay::CScriptRelay(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active) : CEntity(uid, info, active, name) {} @@ -66,4 +66,4 @@ void CScriptRelay::UpdateObjectRef(CStateManager& stateMgr) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptRelay.hpp b/Runtime/World/CScriptRelay.hpp index c280acf1f..c175bed53 100644 --- a/Runtime/World/CScriptRelay.hpp +++ b/Runtime/World/CScriptRelay.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptRelay : public CEntity { TUniqueId x34_nextRelay = kInvalidUniqueId; u32 x38_sendCount = 0; @@ -18,4 +18,4 @@ public: void Think(float, CStateManager& stateMgr) override; void UpdateObjectRef(CStateManager& stateMgr); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptRipple.cpp b/Runtime/World/CScriptRipple.cpp index dae886bd5..a5e59a69f 100644 --- a/Runtime/World/CScriptRipple.cpp +++ b/Runtime/World/CScriptRipple.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptRipple::CScriptRipple(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CVector3f& vec, bool active, float f1) @@ -37,4 +37,4 @@ void CScriptRipple::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CSt } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptRipple.hpp b/Runtime/World/CScriptRipple.hpp index 8f9090acf..d1fbbe25a 100644 --- a/Runtime/World/CScriptRipple.hpp +++ b/Runtime/World/CScriptRipple.hpp @@ -6,7 +6,7 @@ #include -namespace urde { +namespace metaforce { class CScriptRipple : public CEntity { float x34_magnitude; zeus::CVector3f x38_center; @@ -18,4 +18,4 @@ public: void Think(float, CStateManager&) override {} void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptRoomAcoustics.cpp b/Runtime/World/CScriptRoomAcoustics.cpp index 976268ed8..4f8b8d7e7 100644 --- a/Runtime/World/CScriptRoomAcoustics.cpp +++ b/Runtime/World/CScriptRoomAcoustics.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { static TAreaId s_ActiveAcousticsAreaId = kInvalidAreaId; @@ -82,4 +82,4 @@ void CScriptRoomAcoustics::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId o void CScriptRoomAcoustics::Accept(IVisitor& visitor) { visitor.Visit(this); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptRoomAcoustics.hpp b/Runtime/World/CScriptRoomAcoustics.hpp index ca1e0e4b9..dd690b31a 100644 --- a/Runtime/World/CScriptRoomAcoustics.hpp +++ b/Runtime/World/CScriptRoomAcoustics.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { class CScriptRoomAcoustics : public CEntity { u32 x34_volumeScale; @@ -42,4 +42,4 @@ public: static void DisableAuxCallbacks(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptShadowProjector.cpp b/Runtime/World/CScriptShadowProjector.cpp index aaf63414d..914a1ea2c 100644 --- a/Runtime/World/CScriptShadowProjector.cpp +++ b/Runtime/World/CScriptShadowProjector.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptShadowProjector::CScriptShadowProjector(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active, const zeus::CVector3f& offset, @@ -89,4 +89,4 @@ void CScriptShadowProjector::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId } void CScriptShadowProjector::PreRender(CStateManager&, const zeus::CFrustum&) {} -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptShadowProjector.hpp b/Runtime/World/CScriptShadowProjector.hpp index 48e52965e..5d592b328 100644 --- a/Runtime/World/CScriptShadowProjector.hpp +++ b/Runtime/World/CScriptShadowProjector.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CProjectedShadow; class CScriptShadowProjector : public CActor { @@ -34,4 +34,4 @@ public: void AddToRenderer(const zeus::CFrustum&, CStateManager&) override {} void CreateProjectedShadow(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSound.cpp b/Runtime/World/CScriptSound.cpp index 8d9eab1f3..38a0a986f 100644 --- a/Runtime/World/CScriptSound.cpp +++ b/Runtime/World/CScriptSound.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { bool CScriptSound::sFirstInFrame = false; CScriptSound::CScriptSound(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, @@ -225,4 +225,4 @@ void CScriptSound::StopSound(CStateManager& mgr) { xec_sfxHandle.reset(); } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSound.hpp b/Runtime/World/CScriptSound.hpp index d1ca249db..d0ccdef3a 100644 --- a/Runtime/World/CScriptSound.hpp +++ b/Runtime/World/CScriptSound.hpp @@ -6,7 +6,7 @@ #include "Runtime/Audio/CSfxManager.hpp" #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CScriptSound : public CActor { static bool sFirstInFrame; @@ -55,4 +55,4 @@ public: void PlaySound(CStateManager&); void StopSound(CStateManager&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSpawnPoint.cpp b/Runtime/World/CScriptSpawnPoint.cpp index 4ef909033..6dc2b9e42 100644 --- a/Runtime/World/CScriptSpawnPoint.cpp +++ b/Runtime/World/CScriptSpawnPoint.cpp @@ -6,7 +6,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptSpawnPoint::CScriptSpawnPoint(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, @@ -69,4 +69,4 @@ u32 CScriptSpawnPoint::GetPowerup(CPlayerState::EItemType item) const { } return x64_itemCounts[idx]; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSpawnPoint.hpp b/Runtime/World/CScriptSpawnPoint.hpp index 20a488de5..512752d58 100644 --- a/Runtime/World/CScriptSpawnPoint.hpp +++ b/Runtime/World/CScriptSpawnPoint.hpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { class CScriptSpawnPoint : public CEntity { zeus::CTransform x34_xf; @@ -28,4 +28,4 @@ public: u32 GetPowerup(CPlayerState::EItemType item) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSpecialFunction.cpp b/Runtime/World/CScriptSpecialFunction.cpp index c2ca954a0..a967ac74f 100644 --- a/Runtime/World/CScriptSpecialFunction.cpp +++ b/Runtime/World/CScriptSpecialFunction.cpp @@ -22,7 +22,7 @@ #include -namespace urde { +namespace metaforce { CScriptSpecialFunction::CScriptSpecialFunction(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, ESpecialFunction func, @@ -1005,4 +1005,4 @@ void CScriptSpecialFunction::AddOrUpdateEmitter(float pitch, CSfxHandle& handle, CScriptSpecialFunction::SRingController::SRingController(TUniqueId uid, float rotateSpeed, bool reachedTarget) : x0_id(uid), x4_rotateSpeed(rotateSpeed), x8_reachedTarget(reachedTarget) {} -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSpecialFunction.hpp b/Runtime/World/CScriptSpecialFunction.hpp index a3cfd882a..572d10592 100644 --- a/Runtime/World/CScriptSpecialFunction.hpp +++ b/Runtime/World/CScriptSpecialFunction.hpp @@ -12,7 +12,7 @@ #include #include -namespace urde { +namespace metaforce { class CScriptSpecialFunction : public CActor { public: enum class ESpecialFunction { @@ -144,4 +144,4 @@ public: u32 GetSpecialEnding(const CStateManager&) const; void AddOrUpdateEmitter(float pitch, CSfxHandle& handle, u16 id, const zeus::CVector3f& pos, float vol); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSpiderBallAttractionSurface.cpp b/Runtime/World/CScriptSpiderBallAttractionSurface.cpp index 40c9390b6..40f8d534b 100644 --- a/Runtime/World/CScriptSpiderBallAttractionSurface.cpp +++ b/Runtime/World/CScriptSpiderBallAttractionSurface.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptSpiderBallAttractionSurface::CScriptSpiderBallAttractionSurface(TUniqueId uid, std::string_view name, const CEntityInfo& info, @@ -37,4 +37,4 @@ void CScriptSpiderBallAttractionSurface::Touch(CActor& actor, CStateManager& mgr // Empty } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSpiderBallAttractionSurface.hpp b/Runtime/World/CScriptSpiderBallAttractionSurface.hpp index 90d31503e..4aa116bbb 100644 --- a/Runtime/World/CScriptSpiderBallAttractionSurface.hpp +++ b/Runtime/World/CScriptSpiderBallAttractionSurface.hpp @@ -7,7 +7,7 @@ #include #include -namespace urde { +namespace metaforce { class CScriptSpiderBallAttractionSurface : public CActor { zeus::CVector3f xe8_scale; @@ -24,4 +24,4 @@ public: const zeus::CVector3f& GetScale() const { return xe8_scale; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSpiderBallWaypoint.cpp b/Runtime/World/CScriptSpiderBallWaypoint.cpp index 8de35f469..ff952293f 100644 --- a/Runtime/World/CScriptSpiderBallWaypoint.cpp +++ b/Runtime/World/CScriptSpiderBallWaypoint.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptSpiderBallWaypoint::CScriptSpiderBallWaypoint(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active, u32 w1) : CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(EMaterialTypes::NoStepLogic), @@ -204,4 +204,4 @@ void CScriptSpiderBallWaypoint::GetClosestPointAlongWaypoints(CStateManager& mgr } closestWaypoint = wp; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSpiderBallWaypoint.hpp b/Runtime/World/CScriptSpiderBallWaypoint.hpp index 32d209bcf..ed295bd33 100644 --- a/Runtime/World/CScriptSpiderBallWaypoint.hpp +++ b/Runtime/World/CScriptSpiderBallWaypoint.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CScriptSpiderBallWaypoint : public CActor { enum class ECheckActiveWaypoint { Check, SkipCheck }; u32 xe8_; @@ -32,4 +32,4 @@ public: zeus::CVector3f& deltaBetweenPoints, float deltaBetweenInterpDist, zeus::CVector3f& interpDeltaBetweenPoints) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSpindleCamera.cpp b/Runtime/World/CScriptSpindleCamera.cpp index 63bca54e3..8a6c98103 100644 --- a/Runtime/World/CScriptSpindleCamera.cpp +++ b/Runtime/World/CScriptSpindleCamera.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { SSpindleProperty::SSpindleProperty(CInputStream& in) { x4_input = ESpindleInput(in.readUint32Big()); @@ -369,4 +369,4 @@ void CScriptSpindleCamera::Render(CStateManager&) { // Empty } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSpindleCamera.hpp b/Runtime/World/CScriptSpindleCamera.hpp index 4e9d15d8f..649634cdb 100644 --- a/Runtime/World/CScriptSpindleCamera.hpp +++ b/Runtime/World/CScriptSpindleCamera.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { enum class ESpindleInput { Constant, @@ -110,4 +110,4 @@ public: void ProcessInput(const CFinalInput& input, CStateManager& mgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSteam.cpp b/Runtime/World/CScriptSteam.cpp index eca0a01a6..209c64d8f 100644 --- a/Runtime/World/CScriptSteam.cpp +++ b/Runtime/World/CScriptSteam.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptSteam::CScriptSteam(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CVector3f& pos, const zeus::CAABox& aabb, const CDamageInfo& dInfo, const zeus::CVector3f& orientedForce, @@ -59,4 +59,4 @@ void CScriptSteam::Think(float dt, CStateManager& mgr) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSteam.hpp b/Runtime/World/CScriptSteam.hpp index 40d83e0a7..72a253af5 100644 --- a/Runtime/World/CScriptSteam.hpp +++ b/Runtime/World/CScriptSteam.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/World/CScriptTrigger.hpp" -namespace urde { +namespace metaforce { class CScriptSteam : public CScriptTrigger { bool x150_; @@ -26,4 +26,4 @@ public: void Think(float, CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptStreamedMusic.cpp b/Runtime/World/CScriptStreamedMusic.cpp index d98f695cd..049d356c8 100644 --- a/Runtime/World/CScriptStreamedMusic.cpp +++ b/Runtime/World/CScriptStreamedMusic.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { bool CScriptStreamedMusic::IsDSPFile(std::string_view fileName) { if (CStringExtras::CompareCaseInsensitive(fileName, "sw")) { @@ -96,4 +96,4 @@ void CScriptStreamedMusic::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId o } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptStreamedMusic.hpp b/Runtime/World/CScriptStreamedMusic.hpp index e307ddc8d..8f2532c0e 100644 --- a/Runtime/World/CScriptStreamedMusic.hpp +++ b/Runtime/World/CScriptStreamedMusic.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CStateManager; class CScriptStreamedMusic : public CEntity { @@ -33,4 +33,4 @@ public: void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSwitch.cpp b/Runtime/World/CScriptSwitch.cpp index 016401497..715a99099 100644 --- a/Runtime/World/CScriptSwitch.cpp +++ b/Runtime/World/CScriptSwitch.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptSwitch::CScriptSwitch(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active, bool opened, bool closeOnOpened) : CEntity(uid, info, active, name), x34_opened(opened), x35_closeOnOpened(closeOnOpened) {} @@ -30,4 +30,4 @@ void CScriptSwitch::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, C CEntity::AcceptScriptMsg(msg, objId, mgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptSwitch.hpp b/Runtime/World/CScriptSwitch.hpp index 920374725..f1a3615a8 100644 --- a/Runtime/World/CScriptSwitch.hpp +++ b/Runtime/World/CScriptSwitch.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptSwitch : public CEntity { bool x34_opened; bool x35_closeOnOpened; @@ -14,4 +14,4 @@ public: void Accept(IVisitor& visitor) override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptTargetingPoint.cpp b/Runtime/World/CScriptTargetingPoint.cpp index 2b51561ce..4af53b533 100644 --- a/Runtime/World/CScriptTargetingPoint.cpp +++ b/Runtime/World/CScriptTargetingPoint.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptTargetingPoint::CScriptTargetingPoint(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active) @@ -30,4 +30,4 @@ void CScriptTargetingPoint::Think(float dt, CStateManager&) { } bool CScriptTargetingPoint::GetLocked() const { return !x20_conns.empty(); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptTargetingPoint.hpp b/Runtime/World/CScriptTargetingPoint.hpp index e74d4cdec..0d4475b2b 100644 --- a/Runtime/World/CScriptTargetingPoint.hpp +++ b/Runtime/World/CScriptTargetingPoint.hpp @@ -5,7 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CScriptTargetingPoint : public CActor { private: bool xe8_e4_ : 1 = false; @@ -22,4 +22,4 @@ public: bool GetLocked() const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptTimer.cpp b/Runtime/World/CScriptTimer.cpp index 4b625d465..97cb0fec1 100644 --- a/Runtime/World/CScriptTimer.cpp +++ b/Runtime/World/CScriptTimer.cpp @@ -4,7 +4,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptTimer::CScriptTimer(TUniqueId uid, std::string_view name, const CEntityInfo& info, float startTime, float maxRandDelay, bool loop, bool autoStart, bool active) @@ -76,4 +76,4 @@ void CScriptTimer::ApplyTime(float dt, CStateManager& mgr) { x42_isTiming = true; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptTimer.hpp b/Runtime/World/CScriptTimer.hpp index c73f7ea96..e33aad7bd 100644 --- a/Runtime/World/CScriptTimer.hpp +++ b/Runtime/World/CScriptTimer.hpp @@ -3,7 +3,7 @@ #include #include "Runtime/World/CEntity.hpp" -namespace urde { +namespace metaforce { class CScriptTimer : public CEntity { float x34_time; @@ -25,4 +25,4 @@ public: void ApplyTime(float, CStateManager&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptTrigger.cpp b/Runtime/World/CScriptTrigger.cpp index 3700b79c9..ee7093512 100644 --- a/Runtime/World/CScriptTrigger.cpp +++ b/Runtime/World/CScriptTrigger.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptTrigger::CScriptTrigger(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CVector3f& pos, const zeus::CAABox& bounds, const CDamageInfo& dInfo, @@ -298,4 +298,4 @@ void CScriptTrigger::Touch(CActor& act, CStateManager& mgr) { zeus::CAABox CScriptTrigger::GetTriggerBoundsWR() const { return {x130_bounds.min + x34_transform.origin, x130_bounds.max + x34_transform.origin}; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptTrigger.hpp b/Runtime/World/CScriptTrigger.hpp index 0aba70371..ba270a21f 100644 --- a/Runtime/World/CScriptTrigger.hpp +++ b/Runtime/World/CScriptTrigger.hpp @@ -9,7 +9,7 @@ #include #include -namespace urde { +namespace metaforce { // TODO - Phil: Figure out what each of the DetectProjectiles actually mean enum class ETriggerFlags : u32 { @@ -90,4 +90,4 @@ public: } bool IsPlayerTriggerProc() const { return x148_28_playerTriggerProc; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptVisorFlare.cpp b/Runtime/World/CScriptVisorFlare.cpp index 5777d2409..076c13c19 100644 --- a/Runtime/World/CScriptVisorFlare.cpp +++ b/Runtime/World/CScriptVisorFlare.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptVisorFlare::CScriptVisorFlare(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active, const zeus::CVector3f& pos, CVisorFlare::EBlendMode blendMode, bool b1, float f1, @@ -42,4 +42,4 @@ void CScriptVisorFlare::AddToRenderer(const zeus::CFrustum&, CStateManager& stat void CScriptVisorFlare::Render(CStateManager& stateMgr) { xe8_flare.Render(GetTranslation(), stateMgr); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptVisorFlare.hpp b/Runtime/World/CScriptVisorFlare.hpp index 0cda8755c..852dddb98 100644 --- a/Runtime/World/CScriptVisorFlare.hpp +++ b/Runtime/World/CScriptVisorFlare.hpp @@ -5,7 +5,7 @@ #include "Runtime/World/CActor.hpp" #include "Runtime/World/CVisorFlare.hpp" -namespace urde { +namespace metaforce { class CScriptVisorFlare : public CActor { CVisorFlare xe8_flare; @@ -24,4 +24,4 @@ public: void Render(CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptVisorGoo.cpp b/Runtime/World/CScriptVisorGoo.cpp index c75850560..509ef0ef4 100644 --- a/Runtime/World/CScriptVisorGoo.cpp +++ b/Runtime/World/CScriptVisorGoo.cpp @@ -9,7 +9,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptVisorGoo::CScriptVisorGoo(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CAssetId particle, CAssetId electric, float minDist, @@ -121,4 +121,4 @@ void CScriptVisorGoo::Touch(CActor& other, CStateManager& mgr) { // Empty } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptVisorGoo.hpp b/Runtime/World/CScriptVisorGoo.hpp index e53bcf58f..3ce310c86 100644 --- a/Runtime/World/CScriptVisorGoo.hpp +++ b/Runtime/World/CScriptVisorGoo.hpp @@ -7,7 +7,7 @@ #include -namespace urde { +namespace metaforce { class CScriptVisorGoo : public CActor { TToken xe8_particleDesc; @@ -36,4 +36,4 @@ public: void Touch(CActor&, CStateManager&) override; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptWater.cpp b/Runtime/World/CScriptWater.cpp index e3da2c0f5..d001fbf78 100644 --- a/Runtime/World/CScriptWater.cpp +++ b/Runtime/World/CScriptWater.cpp @@ -12,14 +12,14 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { constexpr std::array kSplashScales{ 1.0f, 3.0f, 0.709f, 1.19f, 0.709f, 1.f, }; CScriptWater::CScriptWater( CStateManager& mgr, TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CVector3f& pos, - const zeus::CAABox& box, const urde::CDamageInfo& dInfo, zeus::CVector3f& orientedForce, ETriggerFlags triggerFlags, + const zeus::CAABox& box, const metaforce::CDamageInfo& dInfo, zeus::CVector3f& orientedForce, ETriggerFlags triggerFlags, bool thermalCold, bool allowRender, CAssetId patternMap1, CAssetId patternMap2, CAssetId colorMap, CAssetId bumpMap, CAssetId envMap, CAssetId envBumpMap, CAssetId unusedMap, const zeus::CVector3f& bumpLightDir, float bumpScale, float morphInTime, float morphOutTime, bool active, EFluidType fluidType, bool b4, float alpha, @@ -601,4 +601,4 @@ bool CScriptWater::CanRippleAtPoint(const zeus::CVector3f& point) const { return x2d8_tileIntersects[yTile * x2c4_gridDimX + xTile]; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptWater.hpp b/Runtime/World/CScriptWater.hpp index 1089dc280..6511647ff 100644 --- a/Runtime/World/CScriptWater.hpp +++ b/Runtime/World/CScriptWater.hpp @@ -14,7 +14,7 @@ #include #include -namespace urde { +namespace metaforce { class CDamageInfo; class CFluidUVMotion; @@ -80,7 +80,7 @@ class CScriptWater : public CScriptTrigger { public: CScriptWater(CStateManager& mgr, TUniqueId uid, std::string_view name, const CEntityInfo& info, - const zeus::CVector3f& pos, const zeus::CAABox& box, const urde::CDamageInfo& dInfo, + const zeus::CVector3f& pos, const zeus::CAABox& box, const metaforce::CDamageInfo& dInfo, zeus::CVector3f& orientedForce, ETriggerFlags triggerFlags, bool thermalCold, bool allowRender, CAssetId patternMap1, CAssetId patternMap2, CAssetId colorMap, CAssetId bumpMap, CAssetId envMap, CAssetId envBumpMap, CAssetId unusedMap, const zeus::CVector3f& bumpLightDir, float bumpScale, @@ -137,4 +137,4 @@ public: bool CanRippleAtPoint(const zeus::CVector3f& point) const; const zeus::CColor& GetInsideFogColor() const { return x2a8_insideFogColor; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptWaypoint.cpp b/Runtime/World/CScriptWaypoint.cpp index 0171c0b58..16696bb4d 100644 --- a/Runtime/World/CScriptWaypoint.cpp +++ b/Runtime/World/CScriptWaypoint.cpp @@ -5,7 +5,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptWaypoint::CScriptWaypoint(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, bool active, float speed, float pause, @@ -68,4 +68,4 @@ TUniqueId CScriptWaypoint::NextWaypoint(CStateManager& mgr) const { return ids[int(mgr.GetActiveRandom()->Float() * ids.size() * 0.99f)]; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptWaypoint.hpp b/Runtime/World/CScriptWaypoint.hpp index 0963963a5..28dbcdab0 100644 --- a/Runtime/World/CScriptWaypoint.hpp +++ b/Runtime/World/CScriptWaypoint.hpp @@ -5,7 +5,7 @@ #include "Runtime/GCNTypes.hpp" #include "Runtime/World/CActor.hpp" -namespace urde { +namespace metaforce { class CScriptWaypoint : public CActor { float xe8_speed; @@ -38,4 +38,4 @@ public: u8 GetBehaviourOrient() const { return xf8_behaviourOrient; } u16 GetBehaviourModifiers() const { return xfa_behaviourModifiers; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptWorldTeleporter.cpp b/Runtime/World/CScriptWorldTeleporter.cpp index 160723b3a..08914c9a4 100644 --- a/Runtime/World/CScriptWorldTeleporter.cpp +++ b/Runtime/World/CScriptWorldTeleporter.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CScriptWorldTeleporter::CScriptWorldTeleporter(TUniqueId uid, std::string_view name, const CEntityInfo& info, bool active, CAssetId worldId, CAssetId areaId) : CEntity(uid, info, active, name) @@ -123,4 +123,4 @@ void CScriptWorldTeleporter::StartTransition(CStateManager& mgr) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CScriptWorldTeleporter.hpp b/Runtime/World/CScriptWorldTeleporter.hpp index f6a13019c..02752e930 100644 --- a/Runtime/World/CScriptWorldTeleporter.hpp +++ b/Runtime/World/CScriptWorldTeleporter.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CScriptWorldTeleporter : public CEntity { enum class ETeleporterType { NoTransition, Elevator, Text }; @@ -46,4 +46,4 @@ public: void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override; void StartTransition(CStateManager&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CSnakeWeedSwarm.cpp b/Runtime/World/CSnakeWeedSwarm.cpp index bca3f6772..aba624b43 100644 --- a/Runtime/World/CSnakeWeedSwarm.cpp +++ b/Runtime/World/CSnakeWeedSwarm.cpp @@ -13,7 +13,7 @@ #include "Runtime/World/CWorld.hpp" #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { static constexpr CMaterialFilter skMaterialFilter = CMaterialFilter::MakeInclude({EMaterialTypes::Solid}); @@ -77,7 +77,7 @@ CSnakeWeedSwarm::CSnakeWeedSwarm(TUniqueId uid, bool active, std::string_view na } } -void CSnakeWeedSwarm::Accept(urde::IVisitor& visitor) { visitor.Visit(this); } +void CSnakeWeedSwarm::Accept(metaforce::IVisitor& visitor) { visitor.Visit(this); } void CSnakeWeedSwarm::AllocateSkinnedModels(CStateManager& mgr, CModelData::EWhichModel which) { for (int i = 0; i < x1b0_modelData.size(); ++i) { @@ -437,4 +437,4 @@ std::optional CSnakeWeedSwarm::GetTouchBounds() const { return std::nullopt; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CSnakeWeedSwarm.hpp b/Runtime/World/CSnakeWeedSwarm.hpp index 2b40af53e..4b4ec94dd 100644 --- a/Runtime/World/CSnakeWeedSwarm.hpp +++ b/Runtime/World/CSnakeWeedSwarm.hpp @@ -5,7 +5,7 @@ #include "Runtime/World/CActor.hpp" #include "Runtime/World/CDamageInfo.hpp" -namespace urde { +namespace metaforce { class CAnimationParameters; class CSnakeWeedSwarm : public CActor { @@ -126,4 +126,4 @@ private: void EmitParticles2(const zeus::CVector3f& pos); void RenderBoid(u32 idx, const CBoid& boid, u32& posesToBuild) const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CStateMachine.cpp b/Runtime/World/CStateMachine.cpp index 5ed6c249a..2127ce4ca 100644 --- a/Runtime/World/CStateMachine.cpp +++ b/Runtime/World/CStateMachine.cpp @@ -5,9 +5,9 @@ #include -namespace urde { +namespace metaforce { namespace { -logvisor::Module Log("urde::CStateMachine"); +logvisor::Module Log("metaforce::CStateMachine"); } CStateMachine::CStateMachine(CInputStream& in) { @@ -140,4 +140,4 @@ CFactoryFnReturn FAiFiniteStateMachineFactory(const SObjectTag& tag, CInputStrea return TToken::GetIObjObjectFor(std::make_unique(in)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CStateMachine.hpp b/Runtime/World/CStateMachine.hpp index 2445024a5..671030044 100644 --- a/Runtime/World/CStateMachine.hpp +++ b/Runtime/World/CStateMachine.hpp @@ -9,7 +9,7 @@ #include "Runtime/IOStreams.hpp" #include "Runtime/World/CAiFuncMap.hpp" -namespace urde { +namespace metaforce { class CAiState; class CStateManager; @@ -117,4 +117,4 @@ public: CFactoryFnReturn FAiFiniteStateMachineFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms, CObjectReference*); -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CTeamAiMgr.cpp b/Runtime/World/CTeamAiMgr.cpp index a084ca3be..3983e2a2c 100644 --- a/Runtime/World/CTeamAiMgr.cpp +++ b/Runtime/World/CTeamAiMgr.cpp @@ -7,7 +7,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { struct TeamAiRoleSorter { enum class Type { @@ -394,4 +394,4 @@ TUniqueId CTeamAiMgr::GetTeamAiMgr(const CAi& ai, const CStateManager& mgr) { return kInvalidUniqueId; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CTeamAiMgr.hpp b/Runtime/World/CTeamAiMgr.hpp index 782888ac3..4f7cdd7ea 100644 --- a/Runtime/World/CTeamAiMgr.hpp +++ b/Runtime/World/CTeamAiMgr.hpp @@ -5,7 +5,7 @@ #include -namespace urde { +namespace metaforce { class CStateManager; class CAi; @@ -119,4 +119,4 @@ public: static TUniqueId GetTeamAiMgr(const CAi& ai, const CStateManager& mgr); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CTeamAiTypes.hpp b/Runtime/World/CTeamAiTypes.hpp index 1b1cc9dbf..4fa5c13c9 100644 --- a/Runtime/World/CTeamAiTypes.hpp +++ b/Runtime/World/CTeamAiTypes.hpp @@ -1,7 +1,7 @@ #pragma once -namespace urde { +namespace metaforce { class CTeamAiTypes {}; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CVisorFlare.cpp b/Runtime/World/CVisorFlare.cpp index 0e46e3e8f..050d6baae 100644 --- a/Runtime/World/CVisorFlare.cpp +++ b/Runtime/World/CVisorFlare.cpp @@ -7,7 +7,7 @@ #include "Runtime/CStateManager.hpp" #include "Runtime/CSimplePool.hpp" -namespace urde { +namespace metaforce { std::optional CVisorFlare::LoadFlareDef(CInputStream& in) { u32 propCount = in.readUint32Big(); @@ -96,4 +96,4 @@ void CVisorFlare::Render(const zeus::CVector3f& pos, const CStateManager& mgr) c } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CVisorFlare.hpp b/Runtime/World/CVisorFlare.hpp index c60beab6d..821b9f1c9 100644 --- a/Runtime/World/CVisorFlare.hpp +++ b/Runtime/World/CVisorFlare.hpp @@ -8,7 +8,7 @@ #include -namespace urde { +namespace metaforce { class CActor; class CStateManager; class CTexture; @@ -57,4 +57,4 @@ public: static std::optional LoadFlareDef(CInputStream& in); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CVisorParameters.hpp b/Runtime/World/CVisorParameters.hpp index ef248ed19..8e6a8e161 100644 --- a/Runtime/World/CVisorParameters.hpp +++ b/Runtime/World/CVisorParameters.hpp @@ -2,7 +2,7 @@ #include "Runtime/GCNTypes.hpp" -namespace urde { +namespace metaforce { class CVisorParameters { public: @@ -15,4 +15,4 @@ public: u8 GetMask() const { return x0_mask; } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWallCrawlerSwarm.cpp b/Runtime/World/CWallCrawlerSwarm.cpp index 65a8242bc..0296e660e 100644 --- a/Runtime/World/CWallCrawlerSwarm.cpp +++ b/Runtime/World/CWallCrawlerSwarm.cpp @@ -23,7 +23,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { static CMaterialList MakeMaterialList() { return CMaterialList(EMaterialTypes::Scannable, EMaterialTypes::Trigger, EMaterialTypes::NonSolidDamageable, @@ -1243,4 +1243,4 @@ void CWallCrawlerSwarm::ApplyRadiusDamage(const zeus::CVector3f& pos, const CDam } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWallCrawlerSwarm.hpp b/Runtime/World/CWallCrawlerSwarm.hpp index d5157443d..661311e23 100644 --- a/Runtime/World/CWallCrawlerSwarm.hpp +++ b/Runtime/World/CWallCrawlerSwarm.hpp @@ -17,7 +17,7 @@ #include #include -namespace urde { +namespace metaforce { class CAreaCollisionCache; class CWallCrawlerSwarm : public CActor { public: @@ -202,4 +202,4 @@ public: bool GetLockOnLocationValid(int id) const { return id >= 0 && id < x108_boids.size() && x108_boids[id].GetActive(); } const zeus::CVector3f& GetLockOnLocation(int id) const { return x108_boids[id].GetTranslation(); } }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWallWalker.cpp b/Runtime/World/CWallWalker.cpp index 673150ef6..739d21964 100644 --- a/Runtime/World/CWallWalker.cpp +++ b/Runtime/World/CWallWalker.cpp @@ -8,7 +8,7 @@ #include "TCastTo.hpp" // Generated file, do not modify include path -namespace urde { +namespace metaforce { CWallWalker::CWallWalker(ECharacter chr, TUniqueId uid, std::string_view name, EFlavorType flavType, const CEntityInfo& eInfo, const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo, EMovementType mType, EColliderType colType, EBodyType bType, @@ -180,4 +180,4 @@ void CWallWalker::UpdateWPDestination(CStateManager& mgr) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWallWalker.hpp b/Runtime/World/CWallWalker.hpp index 21428b5bc..63ff20aed 100644 --- a/Runtime/World/CWallWalker.hpp +++ b/Runtime/World/CWallWalker.hpp @@ -9,7 +9,7 @@ #include -namespace urde { +namespace metaforce { class CWallWalker : public CPatterned { public: enum class EWalkerType { Parasite = 0, Oculus = 1, Geemer = 2, IceZoomer = 3, Seedling = 4 }; @@ -58,4 +58,4 @@ public: const CCollisionPrimitive* GetCollisionPrimitive() const override { return &x590_colSphere; } void UpdateWPDestination(CStateManager&); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWorld.cpp b/Runtime/World/CWorld.cpp index 0bb1d61d1..07f2ae239 100644 --- a/Runtime/World/CWorld.cpp +++ b/Runtime/World/CWorld.cpp @@ -14,7 +14,7 @@ #include "Runtime/World/CScriptAreaAttributes.hpp" #include "Runtime/World/CScriptRoomAcoustics.hpp" -namespace urde { +namespace metaforce { CWorld::CSoundGroupData::CSoundGroupData(int grpId, CAssetId agsc) : x0_groupId(grpId), x4_agscId(agsc) { x1c_groupData = g_SimplePool->GetObj(SObjectTag{FOURCC('AGSC'), agsc}); @@ -724,4 +724,4 @@ TAreaId CWorld::GetAreaIdForSaveId(s32 saveId) const { return TAreaId(std::distance(x18_areas.cbegin(), iter)); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWorld.hpp b/Runtime/World/CWorld.hpp index 586474632..ae6951c79 100644 --- a/Runtime/World/CWorld.hpp +++ b/Runtime/World/CWorld.hpp @@ -15,7 +15,7 @@ #include "Runtime/World/CGameArea.hpp" #include "Runtime/World/ScriptObjectSupport.hpp" -namespace urde { +namespace metaforce { class CGameArea; class CResFactory; class IGameArea; @@ -225,4 +225,4 @@ struct CWorldLayers { static void ReadWorldLayers(athena::io::MemoryReader& r, int version, CAssetId mlvlId); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWorldLight.cpp b/Runtime/World/CWorldLight.cpp index e47165e9d..218a1d6c1 100644 --- a/Runtime/World/CWorldLight.cpp +++ b/Runtime/World/CWorldLight.cpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { CWorldLight::CWorldLight(CInputStream& in) : x0_type(EWorldLightType(in.readUint32Big())) , x4_color(zeus::CVector3f::ReadBig(in)) @@ -67,4 +67,4 @@ CLight CWorldLight::GetAsCGraphicsLight() const { zeus::CColor{x4_color.x(), x4_color.y(), x4_color.z(), 1.f}, distC, distL, distQ, 1.f, 0.f, 0.f); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWorldLight.hpp b/Runtime/World/CWorldLight.hpp index 4302617c2..00d088397 100644 --- a/Runtime/World/CWorldLight.hpp +++ b/Runtime/World/CWorldLight.hpp @@ -3,7 +3,7 @@ #include "Runtime/Graphics/CLight.hpp" #include -namespace urde { +namespace metaforce { class CWorldLight { public: enum class EWorldLightType { @@ -45,4 +45,4 @@ public: CLight GetAsCGraphicsLight() const; }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWorldShadow.cpp b/Runtime/World/CWorldShadow.cpp index b3ba176d6..6d6660bf0 100644 --- a/Runtime/World/CWorldShadow.cpp +++ b/Runtime/World/CWorldShadow.cpp @@ -4,7 +4,7 @@ #include "Runtime/Graphics/CBooRenderer.hpp" #include "Runtime/World/CWorld.hpp" -namespace urde { +namespace metaforce { CWorldShadow::CWorldShadow(u32 w, u32 h, bool rgba8) : m_shader(w, h) {} @@ -112,4 +112,4 @@ void CWorldShadow::BuildLightShadowTexture(const CStateManager& mgr, TAreaId aid void CWorldShadow::ResetBlur() { x88_blurReset = true; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWorldShadow.hpp b/Runtime/World/CWorldShadow.hpp index 993f5389b..6c0e91ed4 100644 --- a/Runtime/World/CWorldShadow.hpp +++ b/Runtime/World/CWorldShadow.hpp @@ -9,7 +9,7 @@ #define CWORLDSHADOW_FEEDBACK 0 -namespace urde { +namespace metaforce { class CStateManager; class CWorldShadow { @@ -34,4 +34,4 @@ public: void ResetBlur(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWorldTransManager.cpp b/Runtime/World/CWorldTransManager.cpp index 067978fe8..25ed17053 100644 --- a/Runtime/World/CWorldTransManager.cpp +++ b/Runtime/World/CWorldTransManager.cpp @@ -18,7 +18,7 @@ #include -namespace urde { +namespace metaforce { int CWorldTransManager::GetSuitCharIdx() { CPlayerState& state = *g_GameState->GetPlayerState(); @@ -493,4 +493,4 @@ void CWorldTransManager::SfxStart() { x28_sfxHandle = CSfxManager::SfxStart(x24_sfx, x2c_volume, x2d_panning, false, 127, true, -1); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/CWorldTransManager.hpp b/Runtime/World/CWorldTransManager.hpp index cbeb25bb7..eb9d2c6e2 100644 --- a/Runtime/World/CWorldTransManager.hpp +++ b/Runtime/World/CWorldTransManager.hpp @@ -20,7 +20,7 @@ #include #include -namespace urde { +namespace metaforce { class CSimplePool; class CWorldTransManager { @@ -127,4 +127,4 @@ public: static bool WaitForModelsAndTextures(); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/IGameArea.cpp b/Runtime/World/IGameArea.cpp index c3ad19ff7..82f98e1d9 100644 --- a/Runtime/World/IGameArea.cpp +++ b/Runtime/World/IGameArea.cpp @@ -1,7 +1,7 @@ #include "Runtime/World/IGameArea.hpp" -namespace urde { -IGameArea::Dock::Dock(urde::CInputStream& in, const zeus::CTransform& xf) { +namespace metaforce { +IGameArea::Dock::Dock(metaforce::CInputStream& in, const zeus::CTransform& xf) { u32 refCount = in.readUint32Big(); x4_dockReferences.reserve(refCount); for (u32 i = 0; i < refCount; i++) { @@ -61,4 +61,4 @@ zeus::CVector3f IGameArea::Dock::GetPoint(s32 idx) const { return x14_planeVertices[idx]; } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/IGameArea.hpp b/Runtime/World/IGameArea.hpp index a896bb5c9..97081dce1 100644 --- a/Runtime/World/IGameArea.hpp +++ b/Runtime/World/IGameArea.hpp @@ -10,7 +10,7 @@ #include #include -namespace urde { +namespace metaforce { class CEntity; class IGameArea { @@ -67,4 +67,4 @@ enum class EChain { AliveJudgement, }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/ScriptLoader.cpp b/Runtime/World/ScriptLoader.cpp index 0388b7334..9735f2023 100644 --- a/Runtime/World/ScriptLoader.cpp +++ b/Runtime/World/ScriptLoader.cpp @@ -128,8 +128,8 @@ #include "Runtime/World/CWallCrawlerSwarm.hpp" #include "Runtime/World/CWorld.hpp" -namespace urde { -static logvisor::Module Log("urde::ScriptLoader"); +namespace metaforce { +static logvisor::Module Log("metaforce::ScriptLoader"); constexpr SObjectTag MorphballDoorANCS = {FOURCC('ANCS'), 0x1F9DA858}; @@ -3930,4 +3930,4 @@ CEntity* ScriptLoader::LoadEnergyBall(CStateManager& mgr, CInputStream& in, int std::move(mData), actParms, pInfo, w1, f1, dInfo1, f2, a1, sfxId1, a2, a3, sfxId2, f3, f4, a4, dInfo2, f5); } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/ScriptLoader.hpp b/Runtime/World/ScriptLoader.hpp index 528cb8c70..c85134f92 100644 --- a/Runtime/World/ScriptLoader.hpp +++ b/Runtime/World/ScriptLoader.hpp @@ -5,7 +5,7 @@ #include #include -namespace urde { +namespace metaforce { class CActorParameters; class CAnimationParameters; class CCameraShakeData; @@ -165,4 +165,4 @@ public: static CEntity* LoadEnergyBall(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info); }; -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/ScriptObjectSupport.cpp b/Runtime/World/ScriptObjectSupport.cpp index 45be31f16..2967f2178 100644 --- a/Runtime/World/ScriptObjectSupport.cpp +++ b/Runtime/World/ScriptObjectSupport.cpp @@ -2,7 +2,7 @@ using namespace std::literals; -namespace urde { +namespace metaforce { std::string_view ScriptObjectTypeToStr(EScriptObjectType type) { switch (type) { @@ -443,4 +443,4 @@ std::string_view ScriptObjectMessageToStr(EScriptObjectMessage message) { } } -} // namespace urde +} // namespace metaforce diff --git a/Runtime/World/ScriptObjectSupport.hpp b/Runtime/World/ScriptObjectSupport.hpp index 5af019a04..0284d81a3 100644 --- a/Runtime/World/ScriptObjectSupport.hpp +++ b/Runtime/World/ScriptObjectSupport.hpp @@ -2,7 +2,7 @@ #include -namespace urde { +namespace metaforce { enum class EScriptObjectType { Actor = 0x00, @@ -229,4 +229,4 @@ std::string_view ScriptObjectTypeToStr(EScriptObjectType type); std::string_view ScriptObjectStateToStr(EScriptObjectState state); std::string_view ScriptObjectMessageToStr(EScriptObjectMessage message); -} // namespace urde +} // namespace metaforce diff --git a/lldb-extras/.lldbinit b/lldb-extras/.lldbinit index 130bb0d8b..a1028cd63 100644 --- a/lldb-extras/.lldbinit +++ b/lldb-extras/.lldbinit @@ -1,6 +1,6 @@ -command script import ~/urde_lldb_tools.py -type synthetic add zeus::CMatrix3f --python-class urde_lldb_tools.CMatrix3f_Provider -type synthetic add zeus::CMatrix4f --python-class urde_lldb_tools.CMatrix4f_Provider +command script import ~/metaforce_lldb_tools.py +type synthetic add zeus::CMatrix3f --python-class metaforce_lldb_tools.CMatrix3f_Provider +type synthetic add zeus::CMatrix4f --python-class metaforce_lldb_tools.CMatrix4f_Provider type summary add --summary-string "(${var.__s_.__storage_[0]}, ${var.__s_.__storage_[1]}, ${var.__s_.__storage_[2]}, ${var.__s_.__storage_[3]})" zeus::simd type summary add --summary-string "(${var.__s_.__storage_[0]}, ${var.__s_.__storage_[1]}, ${var.__s_.__storage_[2]}, ${var.__s_.__storage_[3]})" zeus::simd @@ -21,147 +21,147 @@ type summary add --summary-string "start=${var.x0_start} dir=${var.xc_dir} end=$ type summary add --summary-string "pos=${var.position} size=${var.size}" zeus::CRectangle type summary add --summary-string "${var.origin}" zeus::CTransform -type summary add --summary-string "${var.id%x} area=${var.id[16-25]}, layer=${var.id[26-31]}, id=${var.id[0-15]}" urde::TEditorId -type summary add --summary-string "${var.id}" urde::TUniqueId +type summary add --summary-string "${var.id%x} area=${var.id[16-25]}, layer=${var.id[26-31]}, id=${var.id[0-15]}" metaforce::TEditorId +type summary add --summary-string "${var.id}" metaforce::TUniqueId -type summary add --summary-string "${var.x0_time}" urde::CCharAnimTime +type summary add --summary-string "${var.x0_time}" metaforce::CCharAnimTime -type summary add --summary-string "${var.id%x}" urde::CAssetId -type summary add --summary-string "${var.type.fcc} ${var.id.id%x}" urde::SObjectTag +type summary add --summary-string "${var.id%x}" metaforce::CAssetId +type summary add --summary-string "${var.type.fcc} ${var.id.id%x}" metaforce::SObjectTag # \s*(\S+) \((\S+)\) # type summary add --summary-string "\${var.x10_name} \${var.xc_editorId}" $2::$1\n -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}, active=${var.x30_24_active}" urde::CEntity -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CActor -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CEffect -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CExplosion -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CHUDBillboardEffect -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CIceImpact -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CFire -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CFishCloud -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CFishCloudModifier -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CGameCamera -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CBallCamera -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CCinematicCamera -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CFirstPersonCamera -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CInterpolationCamera -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CPathCamera -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptSpindleCamera -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CGameLight -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CPhysicsActor -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CAi -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CDestroyableRock -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CPatterned -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CAtomicAlpha -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CBabygoth -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CBeetle -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CBloodFlower -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CBurrower -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CChozoGhost -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CElitePirate -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CEyeball -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CFireFlea -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CFlickerBat -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CFlyingPirate -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CMagdolite -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CMetaree -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CMetroid -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CMetroidBeta -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CMetroidPrimeExo -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CNewIntroBoss -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CPuddleToadGamma -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CPuffer -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CRidley -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CSpacePirate -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CThardusRockProjectile -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CTryclops -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CWallWalker -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CParasite -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CSeedling -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CWarWasp -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CAmbientAI -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CCollisionActor -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CPlayer -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptActor -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CActorContraption -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptPlayerActor -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptDebris -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptDock -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptDoor -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptGunTurret -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptPickup -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptPlatform -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CRepulsor -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptAiJumpPoint -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptBeam -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptCameraHint -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptCameraHintTrigger -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptCameraPitchVolume -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptCameraWaypoint -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptCoverPoint -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptDamageableTrigger -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptDebugCameraWaypoint -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptEffect -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptEMPulse -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptGrapplePoint -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptMazeNode -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptPlayerHint -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptPointOfInterest -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptShadowProjector -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptSound -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptSpecialFunction -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptSpiderBallAttractionSurface -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptSpiderBallWaypoint -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptTargetingPoint -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptTrigger -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptBallTrigger -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptSteam -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptWater -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptVisorFlare -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptVisorGoo -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptWaypoint -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CSnakeWeedSwarm -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CWallCrawlerSwarm -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CWeapon -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CBomb -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CGameProjectile -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CBeamProjectile -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CPlasmaProjectile -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CEnergyProjectile -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CFlaahgraProjectile -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CMetroidPrimeProjectile -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CTargetableProjectile -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CFlameThrower -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CNewFlameThrower -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CWaveBuster -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CPowerBomb -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CFireFlea::CDeathCameraEffect -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::MP1::CMetroidPrimeRelay -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptActorKeyframe -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptActorRotate -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptAreaAttributes -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptCameraBlurKeyframe -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptCameraFilterKeyframe -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptCameraShaker -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptColorModulate -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptControllerAction -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptCounter -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptDistanceFog -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptDockAreaChange -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptGenerator -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptHUDMemo -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptMemoryRelay -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptMidi -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptPickupGenerator -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptPlayerStateChange -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptRandomRelay -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptRelay -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptRipple -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptRoomAcoustics -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptSpawnPoint -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptStreamedMusic -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptSwitch -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptTimer -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CScriptWorldTeleporter -type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" urde::CTeamAiMgr +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}, active=${var.x30_24_active}" metaforce::CEntity +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CActor +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CEffect +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CExplosion +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CHUDBillboardEffect +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CIceImpact +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CFire +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CFishCloud +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CFishCloudModifier +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CGameCamera +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CBallCamera +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CCinematicCamera +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CFirstPersonCamera +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CInterpolationCamera +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CPathCamera +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptSpindleCamera +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CGameLight +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CPhysicsActor +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CAi +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CDestroyableRock +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CPatterned +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CAtomicAlpha +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CBabygoth +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CBeetle +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CBloodFlower +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CBurrower +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CChozoGhost +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CElitePirate +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CEyeball +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CFireFlea +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CFlickerBat +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CFlyingPirate +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CMagdolite +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CMetaree +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CMetroid +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CMetroidBeta +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CMetroidPrimeExo +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CNewIntroBoss +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CPuddleToadGamma +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CPuffer +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CRidley +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CSpacePirate +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CThardusRockProjectile +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CTryclops +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CWallWalker +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CParasite +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CSeedling +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CWarWasp +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CAmbientAI +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CCollisionActor +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CPlayer +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptActor +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CActorContraption +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptPlayerActor +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptDebris +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptDock +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptDoor +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptGunTurret +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptPickup +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptPlatform +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CRepulsor +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptAiJumpPoint +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptBeam +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptCameraHint +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptCameraHintTrigger +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptCameraPitchVolume +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptCameraWaypoint +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptCoverPoint +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptDamageableTrigger +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptDebugCameraWaypoint +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptEffect +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptEMPulse +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptGrapplePoint +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptMazeNode +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptPlayerHint +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptPointOfInterest +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptShadowProjector +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptSound +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptSpecialFunction +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptSpiderBallAttractionSurface +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptSpiderBallWaypoint +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptTargetingPoint +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptTrigger +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptBallTrigger +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptSteam +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptWater +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptVisorFlare +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptVisorGoo +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptWaypoint +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CSnakeWeedSwarm +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CWallCrawlerSwarm +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CWeapon +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CBomb +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CGameProjectile +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CBeamProjectile +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CPlasmaProjectile +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CEnergyProjectile +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CFlaahgraProjectile +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CMetroidPrimeProjectile +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CTargetableProjectile +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CFlameThrower +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CNewFlameThrower +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CWaveBuster +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CPowerBomb +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CFireFlea::CDeathCameraEffect +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::MP1::CMetroidPrimeRelay +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptActorKeyframe +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptActorRotate +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptAreaAttributes +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptCameraBlurKeyframe +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptCameraFilterKeyframe +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptCameraShaker +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptColorModulate +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptControllerAction +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptCounter +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptDistanceFog +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptDockAreaChange +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptGenerator +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptHUDMemo +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptMemoryRelay +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptMidi +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptPickupGenerator +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptPlayerStateChange +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptRandomRelay +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptRelay +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptRipple +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptRoomAcoustics +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptSpawnPoint +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptStreamedMusic +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptSwitch +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptTimer +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CScriptWorldTeleporter +type summary add --summary-string "${var.x10_name} ${var.xc_editorId}" metaforce::CTeamAiMgr diff --git a/lldb-extras/README.txt b/lldb-extras/README.txt index 5499d6a9d..7b6cddce5 100644 --- a/lldb-extras/README.txt +++ b/lldb-extras/README.txt @@ -1,3 +1,3 @@ -Copy (or append) .lldbinit and urde_lldb_tools.py to your home directory to -enable various URDE type summaries in LLDB. +Copy (or append) .lldbinit and metaforce_lldb_tools.py to your home directory to +enable various Metaforce type summaries in LLDB. diff --git a/lldb-extras/urde_lldb_tools.py b/lldb-extras/metaforce_lldb_tools.py similarity index 100% rename from lldb-extras/urde_lldb_tools.py rename to lldb-extras/metaforce_lldb_tools.py diff --git a/metaforce-gui/ArgumentEditor.cpp b/metaforce-gui/ArgumentEditor.cpp index bfdbc15c2..db1d9c038 100644 --- a/metaforce-gui/ArgumentEditor.cpp +++ b/metaforce-gui/ArgumentEditor.cpp @@ -7,7 +7,7 @@ ArgumentEditor::ArgumentEditor(QWidget* parent) : QDialog(parent), m_ui(std::make_unique()) { m_ui->setupUi(this); - m_model.setStringList(QSettings().value(QStringLiteral("urde_arguments")).toStringList()); + m_model.setStringList(QSettings().value(QStringLiteral("metaforce_arguments")).toStringList()); m_ui->argumentEditor->setModel(&m_model); } @@ -59,7 +59,7 @@ void ArgumentEditor::on_deleteButton_clicked() { void ArgumentEditor::on_buttonBox_clicked(QAbstractButton* button) { auto* buttonBox = qobject_cast(sender()); if (button == buttonBox->button(QDialogButtonBox::Ok)) { - QSettings().setValue(QStringLiteral("urde_arguments"), m_model.stringList()); + QSettings().setValue(QStringLiteral("metaforce_arguments"), m_model.stringList()); accept(); } else { reject(); diff --git a/metaforce-gui/Common.cpp b/metaforce-gui/Common.cpp index 2a8d1b04b..936332593 100644 --- a/metaforce-gui/Common.cpp +++ b/metaforce-gui/Common.cpp @@ -91,7 +91,7 @@ VectorISA StringToVectorISA(const QString& str) { return VectorISA::Invalid; } -URDEVersion::URDEVersion(const QString& filename) { +MetaforceVersion::MetaforceVersion(const QString& filename) { int idx; QString useFilename = filename; if ((idx = filename.lastIndexOf(QLatin1Char{'.'})) > filename.lastIndexOf(QLatin1Char{'-'})) { @@ -153,7 +153,7 @@ URDEVersion::URDEVersion(const QString& filename) { } } -QString URDEVersion::fileString(bool withExtension) const { +QString MetaforceVersion::fileString(bool withExtension) const { if (m_version.isEmpty()) { return {}; } diff --git a/metaforce-gui/Common.hpp b/metaforce-gui/Common.hpp index abcd858eb..f71eac6f5 100644 --- a/metaforce-gui/Common.hpp +++ b/metaforce-gui/Common.hpp @@ -29,7 +29,7 @@ enum class VectorISA { Invalid, X87, SSE, SSE2, SSE3, SSE41, AVX, AVX2, AVX512, QString VectorISAToString(VectorISA visa); VectorISA StringToVectorISA(const QString& str); -class URDEVersion { +class MetaforceVersion { QString m_version{}; Platform m_platform = CurPlatform; Architecture m_architecture = CurArchitecture; @@ -38,8 +38,8 @@ class URDEVersion { QString m_extra{}; public: - URDEVersion() = default; - explicit URDEVersion(const QString& filename); + MetaforceVersion() = default; + explicit MetaforceVersion(const QString& filename); bool isValid() const { return !m_version.isEmpty(); } QString fileString(bool withExtension) const; QString getVersion() const { return m_version; } @@ -48,6 +48,6 @@ public: VectorISA getVectorISA() const { return m_vectorISA; } QString getExtra() const { return m_extra; } }; -Q_DECLARE_METATYPE(URDEVersion); +Q_DECLARE_METATYPE(MetaforceVersion); void InitializePlatform(); diff --git a/metaforce-gui/MainWindow.cpp b/metaforce-gui/MainWindow.cpp index 0aa491158..36fa272fc 100644 --- a/metaforce-gui/MainWindow.cpp +++ b/metaforce-gui/MainWindow.cpp @@ -59,7 +59,8 @@ static void KillProcessTree(QProcess& proc) { } #endif -const QStringList MainWindow::skUpdateTracks = {QStringLiteral("stable"), QStringLiteral("dev"), QStringLiteral("continuous")}; +const QStringList MainWindow::skUpdateTracks = {QStringLiteral("stable"), QStringLiteral("dev"), + QStringLiteral("continuous")}; MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) @@ -69,8 +70,8 @@ MainWindow::MainWindow(QWidget* parent) , m_cvarCommons(m_cvarManager) , m_heclProc(this) , m_dlManager(this) { - if (m_settings.value(QStringLiteral("urde_arguments")).isNull()) { - m_settings.setValue(QStringLiteral("urde_arguments"), QStringList{QStringLiteral("--no-shader-warmup")}); + if (m_settings.value(QStringLiteral("metaforce_arguments")).isNull()) { + m_settings.setValue(QStringLiteral("metaforce_arguments"), QStringList{QStringLiteral("--no-shader-warmup")}); } if (m_settings.value(QStringLiteral("update_track")).isNull()) { m_settings.setValue(QStringLiteral("update_track"), QStringLiteral("dev")); @@ -89,8 +90,8 @@ MainWindow::MainWindow(QWidget* parent) m_ui->processOutput->setFont(mFont); m_cursor = QTextCursor(m_ui->processOutput->document()); connect(m_ui->saveLogButton, &QPushButton::pressed, this, [this] { - QString defaultFileName = QStringLiteral("metaforce-") + QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate) + - QStringLiteral(".log"); + QString defaultFileName = QStringLiteral("metaforce-") + + QDateTime::currentDateTime().toString(Qt::DateFormat::ISODate) + QStringLiteral(".log"); defaultFileName.replace(QLatin1Char(':'), QLatin1Char('-')); const QString fileName = QFileDialog::getSaveFileName(this, tr("Save Log"), defaultFileName, QStringLiteral("*.log")); @@ -234,11 +235,11 @@ void MainWindow::onLaunch() { const auto heclProcArguments = QStringList{m_path + QStringLiteral("/out/MP1")} << m_warpSettings << QStringLiteral("-l") - << m_settings.value(QStringLiteral("urde_arguments")) + << m_settings.value(QStringLiteral("metaforce_arguments")) .toStringList() .join(QLatin1Char{' '}) .split(QLatin1Char{' '}); - m_heclProc.start(m_urdePath, heclProcArguments, QIODevice::ReadOnly | QIODevice::Unbuffered); + m_heclProc.start(m_metaforcePath, heclProcArguments, QIODevice::ReadOnly | QIODevice::Unbuffered); m_ui->heclTabs->setCurrentIndex(0); @@ -262,11 +263,11 @@ void MainWindow::onIndexDownloaded(const QStringList& index) { int bestVersion = 0; m_ui->binaryComboBox->clear(); for (const QString& str : index) { - URDEVersion version(str); + MetaforceVersion version(str); m_ui->binaryComboBox->addItem(version.fileString(false), QVariant::fromValue(version)); } m_ui->binaryComboBox->setCurrentIndex(bestVersion); - m_recommendedVersion = m_ui->binaryComboBox->itemData(bestVersion).value(); + m_recommendedVersion = m_ui->binaryComboBox->itemData(bestVersion).value(); m_ui->recommendedBinaryLabel->setText(m_recommendedVersion.fileString(false)); m_ui->binaryComboBox->setEnabled(true); @@ -277,7 +278,7 @@ void MainWindow::onIndexDownloaded(const QStringList& index) { } void MainWindow::onDownloadPressed() { - QString filename = m_ui->binaryComboBox->currentData().value().fileString(true); + QString filename = m_ui->binaryComboBox->currentData().value().fileString(true); #if PLATFORM_ZIP_DOWNLOAD disableOperations(); m_ui->downloadButton->setEnabled(false); @@ -401,7 +402,7 @@ static bool GetDLPackage(const QString& path, QString& dlPackage) { } bool MainWindow::checkDownloadedBinary() { - m_urdePath = QString(); + m_metaforcePath = QString(); m_heclPath = QString(); if (m_path.isEmpty()) { @@ -413,34 +414,35 @@ bool MainWindow::checkDownloadedBinary() { const QString dir = QApplication::instance()->applicationDirPath(); #if _WIN32 - QString urdePath = dir + QStringLiteral("/metaforce.exe"); + QString metaforcePath = dir + QStringLiteral("/metaforce.exe"); QString heclPath = dir + QStringLiteral("/hecl.exe"); QString visigenPath = dir + QStringLiteral("/visigen.exe"); - if (!QFileInfo::exists(urdePath) || !QFileInfo::exists(heclPath) || !QFileInfo::exists(visigenPath)) { - urdePath = m_path + QStringLiteral("/metaforce.exe"); + if (!QFileInfo::exists(metaforcePath) || !QFileInfo::exists(heclPath) || !QFileInfo::exists(visigenPath)) { + metaforcePath = m_path + QStringLiteral("/metaforce.exe"); heclPath = m_path + QStringLiteral("/hecl.exe"); visigenPath = m_path + QStringLiteral("/visigen.exe"); } #else - QString urdePath = dir + QStringLiteral("/metaforce"); + QString metaforcePath = dir + QStringLiteral("/metaforce"); QString heclPath = dir + QStringLiteral("/hecl"); QString visigenPath = dir + QStringLiteral("/visigen"); #endif - urdePath = QFileInfo(urdePath).absoluteFilePath(); + metaforcePath = QFileInfo(metaforcePath).absoluteFilePath(); heclPath = QFileInfo(heclPath).absoluteFilePath(); visigenPath = QFileInfo(visigenPath).absoluteFilePath(); - QString urdeDlPackage, heclDlPackage, visigenDlPackage; - if (GetDLPackage(urdePath, urdeDlPackage) && GetDLPackage(heclPath, heclDlPackage) && + QString metaforceDlPackage, heclDlPackage, visigenDlPackage; + if (GetDLPackage(metaforcePath, metaforceDlPackage) && GetDLPackage(heclPath, heclDlPackage) && GetDLPackage(visigenPath, visigenDlPackage)) { - if (!urdeDlPackage.isEmpty() && urdeDlPackage == heclDlPackage && urdeDlPackage == visigenDlPackage) { - URDEVersion v(urdeDlPackage); + if (!metaforceDlPackage.isEmpty() && metaforceDlPackage == heclDlPackage && + metaforceDlPackage == visigenDlPackage) { + MetaforceVersion v(metaforceDlPackage); m_ui->currentBinaryLabel->setText(v.fileString(false)); } else { m_ui->currentBinaryLabel->setText(tr("unknown -- re-download recommended")); } - m_urdePath = urdePath; + m_metaforcePath = metaforcePath; m_heclPath = heclPath; m_ui->downloadErrorLabel->setText({}, true); enableOperations(); @@ -655,7 +657,7 @@ void MainWindow::initOptions() { "tweak.game.SplashScreensDisabled"sv, "Skip splash screens on game startup", false, hecl::CVar::EFlags::ReadOnly | hecl::CVar::EFlags::Archive | hecl::CVar::EFlags::Game)); - m_launchOptionsModel.setStringList(QSettings().value(QStringLiteral("urde_arguments")).toStringList()); + m_launchOptionsModel.setStringList(QSettings().value(QStringLiteral("metaforce_arguments")).toStringList()); m_ui->launchOptionsList->setModel(&m_launchOptionsModel); connect(m_ui->launchOptionAddButton, &QPushButton::clicked, this, [this] { @@ -677,9 +679,9 @@ void MainWindow::initOptions() { } }); connect(&m_launchOptionsModel, &QStringListModel::dataChanged, this, - [this]() { QSettings().setValue(QStringLiteral("urde_arguments"), m_launchOptionsModel.stringList()); }); + [this]() { QSettings().setValue(QStringLiteral("metaforce_arguments"), m_launchOptionsModel.stringList()); }); connect(&m_launchOptionsModel, &QStringListModel::rowsRemoved, this, - [this]() { QSettings().setValue(QStringLiteral("urde_arguments"), m_launchOptionsModel.stringList()); }); + [this]() { QSettings().setValue(QStringLiteral("metaforce_arguments"), m_launchOptionsModel.stringList()); }); connect(m_ui->warpBtn, &QPushButton::clicked, this, [this] { QFileInfo areaPath( QFileDialog::getOpenFileName(this, tr("Select area to warp to..."), m_path, QStringLiteral("*.blend"))); diff --git a/metaforce-gui/MainWindow.hpp b/metaforce-gui/MainWindow.hpp index 3a96871aa..2c4de4f32 100644 --- a/metaforce-gui/MainWindow.hpp +++ b/metaforce-gui/MainWindow.hpp @@ -33,13 +33,13 @@ class MainWindow : public QMainWindow { hecl::CVarCommons m_cvarCommons; QTextCursor m_cursor; QString m_path; - QString m_urdePath; + QString m_metaforcePath; QString m_heclPath; QProcess m_heclProc; DownloadManager m_dlManager; QStringList m_warpSettings; QSettings m_settings; - URDEVersion m_recommendedVersion; + MetaforceVersion m_recommendedVersion; bool m_inContinueNote = false; QStringListModel m_launchOptionsModel;