AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #87 from lioncash/seedling 

CSeedling: Convert array of std::string to array of std::string_view
This commit is contained in:
Phillip Stephens 2019-09-28 22:09:08 -07:00 committed by GitHub
parent 00cff89141 6ad5de497f
commit bb43821f31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Runtime/MP1/World/CSeedling.cpp
View File

@ -1,13 +1,36 @@
#include "MP1/World/CSeedling.hpp" #include "Runtime/MP1/World/CSeedling.hpp"
#include "World/CPatternedInfo.hpp"
#include "World/CWorld.hpp" #include <array>
#include "World/CGameArea.hpp"
#include "World/CPlayer.hpp" #include "Runtime/CStateManager.hpp"
#include "CStateManager.hpp" #include "Runtime/World/CGameArea.hpp"
#include "Runtime/World/CPatternedInfo.hpp"
#include "Runtime/World/CPlayer.hpp"
#include "Runtime/World/CWorld.hpp"
#include "TCastTo.hpp" // Generated file, do not modify include path #include "TCastTo.hpp" // Generated file, do not modify include path
#include "CSeedling.hpp"
namespace urde::MP1 { namespace urde::MP1 {
namespace {
constexpr std::array<std::array<std::string_view, 6>, 2> skNeedleLocators{{
{
"A_spike1_LCTR_SDK",
"A_spike2_LCTR_SDK",
"A_spike3_LCTR_SDK",
"A_spike4_LCTR_SDK",
"A_spike5_LCTR_SDK",
"A_spike6_LCTR_SDK",
},
{
"B_spike1_LCTR_SDK",
"B_spike2_LCTR_SDK",
"B_spike3_LCTR_SDK",
"B_spike4_LCTR_SDK",
"B_spike5_LCTR_SDK",
"B_spike6_LCTR_SDK",
},
}};
} // Anonymous namespace
CSeedling::CSeedling(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf, CSeedling::CSeedling(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CPatternedInfo& pInfo, const CActorParameters& actParms, CModelData&& mData, const CPatternedInfo& pInfo, const CActorParameters& actParms,
@ -29,23 +52,6 @@ CSeedling::CSeedling(TUniqueId uid, std::string_view name, const CEntityInfo& in
void CSeedling::Accept(IVisitor& visitor) { visitor.Visit(this); } void CSeedling::Accept(IVisitor& visitor) { visitor.Visit(this); }
const std::string CSeedling::skNeedleLocators[2][6] = {{
"A_spike1_LCTR_SDK",
"A_spike2_LCTR_SDK",
"A_spike3_LCTR_SDK",
"A_spike4_LCTR_SDK",
"A_spike5_LCTR_SDK",
"A_spike6_LCTR_SDK",
},
{
"B_spike1_LCTR_SDK",
"B_spike2_LCTR_SDK",
"B_spike3_LCTR_SDK",
"B_spike4_LCTR_SDK",
"B_spike5_LCTR_SDK",
"B_spike6_LCTR_SDK",
}};
void CSeedling::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) { void CSeedling::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
CPatterned::AcceptScriptMsg(msg, uid, mgr); CPatterned::AcceptScriptMsg(msg, uid, mgr);
@ -103,13 +109,14 @@ void CSeedling::Think(float dt, CStateManager& mgr) {
void CSeedling::Render(const CStateManager& mgr) const { void CSeedling::Render(const CStateManager& mgr) const {
if (x400_25_alive && x6bc_spikeData) { if (x400_25_alive && x6bc_spikeData) {
u32 index = x722_24_renderOnlyClusterA ? 0 : u32(x722_25_curNeedleCluster); const size_t index = x722_24_renderOnlyClusterA ? 0 : size_t(x722_25_curNeedleCluster);
CModelFlags flags; CModelFlags flags;
flags.x2_flags = 3; flags.x2_flags = 3;
flags.x4_color = zeus::skWhite; flags.x4_color = zeus::skWhite;
for (const std::string& sv : skNeedleLocators[index]) for (const std::string_view sv : skNeedleLocators[index]) {
x6bc_spikeData->Render(mgr, GetLctrTransform(sv), x90_actorLights.get(), flags); x6bc_spikeData->Render(mgr, GetLctrTransform(sv), x90_actorLights.get(), flags);
}
} }
CWallWalker::Render(mgr); CWallWalker::Render(mgr);
@ -202,9 +209,11 @@ bool CSeedling::ShouldAttack(CStateManager& mgr, float) {
} }
void CSeedling::LaunchNeedles(CStateManager& mgr) { void CSeedling::LaunchNeedles(CStateManager& mgr) {
for (const std::string& needle : skNeedleLocators[u32(x722_25_curNeedleCluster)]) const auto& needleLocators = skNeedleLocators[size_t(x722_25_curNeedleCluster)];
LaunchProjectile(GetLctrTransform(needle), mgr, 6, EProjectileAttrib::None, true, {}, 0xFFFF, false, for (const std::string_view needle : needleLocators) {
GetModelData()->GetScale()); LaunchProjectile(GetLctrTransform(needle), mgr, int(needleLocators.size()), EProjectileAttrib::None, true, {},
0xFFFF, false, GetModelData()->GetScale());
}
x722_25_curNeedleCluster = !x722_25_curNeedleCluster; x722_25_curNeedleCluster = !x722_25_curNeedleCluster;
x722_24_renderOnlyClusterA = false; x722_24_renderOnlyClusterA = false;

1
Runtime/MP1/World/CSeedling.hpp
View File

@ -11,7 +11,6 @@
namespace urde::MP1 { namespace urde::MP1 {
class CSeedling : public CWallWalker { class CSeedling : public CWallWalker {
static const std::string skNeedleLocators[2][6];
CPathFindSearch x5d8_searchPath; CPathFindSearch x5d8_searchPath;
std::unique_ptr<CModelData> x6bc_spikeData; std::unique_ptr<CModelData> x6bc_spikeData;
CProjectileInfo x6c0_projectileInfo; CProjectileInfo x6c0_projectileInfo;