AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 09:07:43 +00:00
Code Issues Projects Releases Wiki Activity

RetroDataSpec: Use override where applicable

Browse Source 
Continues the override modernizations, applying the keyword where
applicable to the RetroDataSpec target.
This commit is contained in:
Lioncash
2019-08-09 22:32:48 -04:00
parent 1e625e0995
commit a5a2516138
101 changed files with 1230 additions and 1150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DataSpec/DNAMP1/ScriptObjects/DamageableTrigger.hpp
View File

@@ -21,7 +21,7 @@ struct DamageableTrigger : IScriptObject {
Value<bool> active;
VisorParameters visorParameters;
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const {
void nameIDs(PAKRouter<PAKBridge>& pakRouter) const override {
if (patternTex1.isValid()) {
PAK::Entry* ent = (PAK::Entry*)pakRouter.lookupEntry(patternTex1);
ent->name = name + "_patternTex1";
@@ -36,13 +36,14 @@ struct DamageableTrigger : IScriptObject {
}
}
void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut, std::vector<hecl::ProjectPath>& lazyOut) const {
void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut,
std::vector<hecl::ProjectPath>& lazyOut) const override {
g_curSpec->flattenDependencies(patternTex1, pathsOut);
g_curSpec->flattenDependencies(patternTex2, pathsOut);
g_curSpec->flattenDependencies(colorTex, pathsOut);
}
zeus::CAABox getVISIAABB(hecl::blender::Token& btok) const {
zeus::CAABox getVISIAABB(hecl::blender::Token& btok) const override {
zeus::CVector3f halfExtent = zeus::CVector3f(volume) / 2.f;
zeus::CVector3f loc(location);
return zeus::CAABox(loc - halfExtent, loc + halfExtent);