AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,049 Commits 26 Branches 15 Tags 52 MiB
Commit Graph

912 Commits

Author SHA1 Message Date
Luke Street eb89a17817 CDummyWorld: Fix IGetAreaId 2020-04-14 21:15:38 -04:00
Lioncash 6436184a3f CWorld: Make use of find_if in GetAreaIdForSaveId() 
Same behavior minus any explicit mutable state.
 2020-04-14 16:40:13 -04:00
Lioncash 86b94ad915 CWorld: Make use of std::find_if in IGetAreaId 
Removes explicit mutable state. This can be further simplified in the
future with ranges.
 2020-04-14 16:31:17 -04:00
Lioncash 655805ffcb CWorld: Add missing override specifier 2020-04-14 16:17:26 -04:00
Luke Street 594fe2fcbd
Merge pull request #310 from lioncash/table 
CFluidPlane: Make use of std::array where applicable
 2020-04-14 02:09:19 -04:00
Lioncash 2850b7e7fb CWallCrawlerSwarm: Initialize all CBoid members 
Provides a deterministic initial state.
 2020-04-13 16:36:24 -04:00
Lioncash 7fcd6f41cf CStateMachine: Initialize data members where applicable 
Provides a deterministic initial state.
 2020-04-13 16:34:18 -04:00
Lioncash 0d97104cf2 CScriptSpindleCamera: Initialize x33c_24_inResetThink in constructor 
Provides a deterministic initial state.
 2020-04-13 16:32:41 -04:00
Lioncash 4341dfae50 CScriptPickup: Initialize x274_tractorTime in constructor 
Provides a deterministic initial state upon construction.
 2020-04-13 16:31:28 -04:00
Lioncash a554e5d4a6 CPathFindSearch: Initialize xcc_result in constructor 
Provides a deterministic initial state upon construction.
 2020-04-13 16:29:12 -04:00
Lioncash 9f21f8ef55 CFluidPlaneCPU: Initialize m_cachedDoubleLightmapBlend and m_cachedAdditive 
Provides a deterministic initial state upon construction.
 2020-04-13 16:27:21 -04:00
Lioncash 498c940479 CFluidPlane: Initialize all members of SRippleInfo 
Provides a deterministic initial state, which is useful for debugging.
 2020-04-13 16:25:36 -04:00
Lioncash 29cd228d03 CMorphBall: Eliminate hardcoded sizes 
We can query the container capacity directly instead of hardcoding it
in.
 2020-04-13 14:10:52 -04:00
Lioncash 414c06b33e CScriptDebris: Make use of std::array 
Same behavior, stronger typing.
 2020-04-12 21:07:17 -04:00
Lioncash 7df73b6f4c CScriptDock: Get rid of variable shadowing 
Same behavior, less bug vectors.
 2020-04-12 15:29:53 -04:00
Lioncash 7fb2b6ac0b CScriptDock: Make dock material list constexpr 
Same behavior, no runtime overhead.
 2020-04-12 15:28:18 -04:00
Lioncash 175502cb0d CScriptMazeNode: Make use of std::array where applicable 
Same behavior, stronger typing.
 2020-04-12 15:23:28 -04:00
Lioncash c84f430852 CScriptPlatform: Simplify IsRider() 
Same behavior, less code.
 2020-04-12 15:11:24 -04:00
Lioncash fd5c6f9e59 CScriptPlatform: Make use of TCastToConstPtr where applicable 
Makes the read-only intent more explicit to the reader.
 2020-04-12 14:59:59 -04:00
Lioncash ff847eaf41 CScriptPlatform: Make platform material list constexpr 
Same behavior, no runtime overhead.
 2020-04-12 14:11:11 -04:00
Lioncash 1d112134cf CScriptPlayerHint: Make use of std::any_of/std::find_if where applicable 
Same behavior, can be simplified even further with ranges in the future.
 2020-04-12 14:00:34 -04:00
Lioncash ff123f7820 General: Make use of static_cast within point generators 
The more restrictive static_cast is permissable when casting from void*.
 2020-04-12 13:29:34 -04:00
Lioncash 5d85cd496a CFluidPlane: Make use of std::array where applicable 
Makes all the arrays strongly typed. We can also use type aliases to
greatly shorten some type definitions.
 2020-04-12 12:17:12 -04:00
Lioncash fa1e4f38df CScriptWater: Mark SolidFilter as constexpr 
Same behavior, minus runtime initializers.
 2020-04-12 11:59:08 -04:00
Lioncash dfa206eda9 CScriptSpecialFunction: Make use of std::array where applicable 
Same behavior, stronger typing.
 2020-04-12 11:58:08 -04:00
Lioncash beaccf4f9e CScriptSound: Mark kSolidFilter as constexpr 
Same behavior minus runtime initializers.
 2020-04-12 11:56:37 -04:00
Lioncash 2e575c184e CPatterned: Make use of constexpr where applicable 2020-04-12 11:55:40 -04:00
Lioncash d8e7239bc6 CKnockBackController: Make use of std::array where applicable 
Same behavior, stronger typing.
 2020-04-12 11:53:17 -04:00
Lioncash b2ec3e7eac CGameArea: Make use of std::array where applicable 
Same behavior, stronger typing, and optional runtime checking in debug
mode.
 2020-04-12 11:36:19 -04:00
Lioncash 14f6dd2cd8 CFluidUVMotion: Return std::array by value from CalculateFluidTextureOffset() 
Same behavior, but allows for easier use of API and makes it harder to
misuse. It also makes it easier for analysis to determine out of bounds,
given we leverage std::array rather than a pointer that causes arrays to
decay and lose their size information.
 2020-04-12 09:23:52 -04:00
Lioncash 3c8619ba44 CFluidPlaneManager: Make use of std::array where applicable 
Eliminates any potential implicit array to pointer decay.
 2020-04-12 09:09:18 -04:00
Lioncash 2069694b59 CFluidPlane: Make use of HasReference() instead of operator bool 
Looks a little less out of place while performing the same behavior.
IDE's can also do lookup more reliably on a regular function as opposed
to a conversion operator.
 2020-04-12 08:52:23 -04:00
Lioncash aa8f17d847 CFire: Return std::nullopt in GetTouchBounds() 
Avoids unnecessarily zeroing out the entire internal buffer in
std::optional in some implementations (libstdc++/libc++).
 2020-04-12 08:46:23 -04:00
Luke Street 32134990c3
Merge pull request #309 from lioncash/constexpr8 
CMorphBall: Make use of constexpr on file-scope arrays
 2020-04-12 03:06:59 -04:00
Luke Street 56cebfbacd
Merge pull request #308 from AxioDL/fmtlib-update 
Update fmtlib
 2020-04-12 03:06:46 -04:00
Luke Street 9f8064b4a1
Merge pull request #307 from lioncash/constexpr7 
CModel: Mark CModelFlag instances as constexpr where applicable
 2020-04-12 03:06:12 -04:00
Lioncash 1fff540102 CAnimPlaybackParms: Make class constexpr constructible 
Allows for removal of some trivial runtime initializers.
 2020-04-11 20:55:46 -04:00
Lioncash fef6711ce8 CMorphBall: Make use of constexpr on file-scope arrays 
Same behavior, but allows elision of runtime initializers.
 2020-04-11 20:41:52 -04:00
Lioncash 76e226f831 CWorldTransManager: Convert one missed array over to std::array 2020-04-11 19:55:23 -04:00
Lioncash 58fdb64ab5 CWorldTransManager: Initialize all members on construction 
Provides a deterministic initial state upon construction, making
debugging easier.
 2020-04-11 19:53:30 -04:00
Lioncash e72507b20c CWorldTransManager: Make use of std::array where applicable 
Provides stronger typing, and eliminates any potential implicit array to
pointer decay.
 2020-04-11 19:50:49 -04:00
Jack Andersen 5b4441ac36 Update fmtlib 2020-04-11 12:51:39 -10:00
Lioncash 75c07677ed CModel: Mark CModelFlag instances as constexpr where applicable 
Allows more runtime initializes to potentially be elided.
 2020-04-11 16:56:13 -04:00
Lioncash 75d8988ee8 CRandom16: Make constructor explicit 
Same behavior, minus the implicit conversions upon construction.
 2020-04-11 16:15:05 -04:00
Lioncash 01bb0f3840 CWorld: Separate enum definition from declaration 
Allows more flexibility if anything ever gets moved around and is
arguably nicer to read.
 2020-04-11 15:29:01 -04:00
Luke Street 072ac0df16 Runtime: Wrap printf calls in #ifndef NDEBUG 2020-04-11 02:35:55 -04:00
Luke Street e23c3d3705 Runtime: Wrap fmt::print calls in #ifndef NDEBUG 2020-04-11 02:25:41 -04:00
Luke Street 22ac7d8099 CScriptCoverPoint: Fix GetAttackDirection return value 2020-04-11 02:09:58 -04:00
Luke Street 0339c16e20 CScriptCoverPoint: Fix GetAttackDirection 2020-04-11 02:02:28 -04:00
Luke Street bb7e94f304 Runtime/World: Replace bitfield unions with constructor initializers 2020-04-11 01:50:10 -04:00
Lioncash f74c2d446f CEnvFxManager: Remove mutable keywords where applicable 
We can just make the relevant functions non-const to remove the use of
mutable here.
 2020-04-10 13:22:22 -04:00
Lioncash e0a4dc37a4 CPathFindSearch: Remove use of mutable on m_viz 
We can just drop the const qualifier on DebugDraw() to get rid of the
need to specify this.
 2020-04-09 21:50:01 -04:00
Lioncash 549f58d835 CScriptDamageableTrigger: Remove mutable specifier on x254_fluidPlane 
This is no longer necessary now that Render() is non-const.
 2020-04-09 21:46:57 -04:00
Luke Street 6b814262fc Merge remote-tracking branch 'origin/master' into omegapirate 2020-04-09 20:06:33 -04:00
Lioncash a2f7527388 CScriptPlayerActor: Remove two usages of const_cast 
While we're at it, we can also simplify the implementation of
GetPostConstructed().
 2020-04-09 20:05:53 -04:00
Lioncash c796cf5315 CScriptSpecialFunction: Remove unnecessary const_cast in AcceptScriptMsg() 
This const_cast isn't required at all any more.
 2020-04-09 19:55:31 -04:00
Lioncash bfd17e4513 CActor: Make Render() a non-const function 
A few implementations of Render() contain const-casts nested within its
their call hierarchy to get around the fact that this function is marked
const. We can just make the member function non-const to allow removal
of these casts in follow up changes.
 2020-04-09 14:32:20 -04:00
Luke Street 7774bc06ca
Merge pull request #297 from lioncash/render 
CActor: Make AddToRenderer() non-const
 2020-04-09 10:55:16 -04:00
Luke Street 416ca4653b CScriptEffect: Minor fixes 2020-04-07 23:39:01 -04:00
Luke Street 1dc90f78d3 CScriptPlatform: Fix AddRider assign to copy 2020-04-07 15:41:26 -04:00
Lioncash 139d290d7d CWorldTransManager: Mark lightPos as constexpr in UpdateLights() 
Allows the compiler to optimize the initialization away if it chooses to
do so.
 2020-04-07 07:23:14 -04:00
Lioncash 7ba5a5b183 CWorldLight: Explicitly default copy assignment, move assignment and move constructor 
Makes the interface consistent with how the constructor is specified.
 2020-04-07 07:19:50 -04:00
Luke Street 46afe6eae8 COmegaPirate: Implement DoubleSnap & finish DoUserAnimEvent 2020-04-06 16:56:10 -04:00
Luke Street c9f96d47d2 CPhazonPool: Initial structure 2020-04-06 16:56:10 -04:00
Luke Street 80b383b68f CPhazonHealingNodule: Add DEFINE_PATTERNED 2020-04-06 16:56:10 -04:00
Luke Street 0bef9104b5 CPhazonHealingNodule: Create class 2020-04-06 16:56:10 -04:00
Luke Street 93751972ac COmegaPirate: Implement AcceptScriptMsg & collision setup 2020-04-06 16:56:10 -04:00
Luke Street fb9765656c COmegaPirate: Start implementation 2020-04-06 16:56:10 -04:00
Lioncash dd7d9c024f CGameLight: Add parameter names to function prototypes 
Same behavior, but more self-documenting from interface alone. Also
allows better parameter introspection.
 2020-04-06 08:46:38 -04:00
Lioncash 41c2ede092 CScriptWater: Make private const data internally linked 
Same behavior, but allows completely hiding it from external view and
also allows making the data constexpr.
 2020-04-06 05:42:15 -04:00
Lioncash c9e8b3366d CFluidPlane: Resolve constness related compile errors that slipped through 
Gotta love Find References not, in fact, finding all the references.
 2020-04-06 05:31:09 -04:00
Lioncash d708337e90 CScriptDamageableTrigger: Make member variables private 
Previously, everything about the class was made public.
 2020-04-06 04:48:10 -04:00
Lioncash 27f3078c8a CScriptDamageableTrigger: Mark x254_fluidPlane as mutable 
A temporary stop-gap to hold over until Render is made non-const.
 2020-04-06 04:45:33 -04:00
Lioncash 402216447a CFluidPlane: Make Render() non-const 
Allows making the shader instances non-mutable.
 2020-04-06 02:18:14 -04:00
Lioncash cabbfcc320 CActor: Make AddToRenderer() non-const 
This member function alters instance state in a few implementations, so
it shouldn't be made const.

The state manager parameter also shouldn't be const. Retrieved data
from the post constructed instance is further modified in some
implementations. This removes the constness on this parameter in order
to fix more const_cast usages in a follow-up change.
 2020-04-06 00:52:10 -04:00
Lioncash f77fb2089b General: Pass std::nullopt to CAnimData::Render instead of {} 
Prevents some implementations (libstdc++ and libc++) from completely zeroing out the underlying
buffer and instead sets a single byte flag.

Eliminates unnecessary memsets.
 2020-04-05 08:24:42 -04:00
Lioncash ad30f0c61c CActorModelParticles: Make GetParticleDGRPTokens take a std::string_view 
Same behavior, but provides a more type-safe interface. All internal
functions called within the function operate on std::string_view
anyways.
 2020-04-03 00:36:53 -04:00
Lioncash 75aa359855 CActorModelParticles: Use static_cast instead of reinterpret_cast in PointGenerator() 
Casting from void* to a concrete type is permitted with static_cast.
 2020-04-03 00:28:14 -04:00
Lioncash a80838b2df CActorModelParticles: Don't cast away const in SetupHook() 
Now that we have a non-const overload, we don't need to cast away const
any longer, removing a cast-qual warning.
 2020-04-03 00:26:35 -04:00
Lioncash 9ac1a94a5f CActorModelParticles: Add non-const overload of FindSystem() 
Same behavior but returns a non-const iterator, which will be used in a
following change.
 2020-04-03 00:24:52 -04:00
Lioncash b33fcf9e02 CActorModelParticles: Collapse FindSystem() into a find_if call 
Same behavior, less code.
 2020-04-03 00:22:37 -04:00
Lioncash c913502d90 CActorModelParticles: Dehardcode container sizes where applicable 2020-04-03 00:08:09 -04:00
Lioncash 93dd28988d CGameArea: Make use of std::make_unique where applicable 2020-04-02 22:02:57 -04:00
Lioncash 333fee56e3 CPlayer: Const correctness and bracing consistency changes 
Minor surface-level changes to make it nicer to see that certain
variables don't get modified within some operations.

Given some functions are quite large, this is generally nice to see.
 2020-04-02 07:39:00 -04:00
Lioncash e7e73e8658 CPlayer: Make use of std::make_unique for x76c_cameraBob 
Same behavior, but more consistent with other usages of
std::make_unique.
 2020-04-02 03:48:31 -04:00
Lioncash e956402956 CPlayerEnergyDrain: Collapse loop into std::accumulate 
Same behavior, less code.
 2020-04-02 03:45:07 -04:00
Luke Street 206be48b43
Merge pull request #292 from lioncash/automap 
CAutoMapper: Eliminate usages of const_cast
 2020-04-02 02:31:00 -04:00
Luke Street de59ea45eb ScriptLoader: Zero out itemCounts 2020-04-01 21:17:05 -04:00
Luke Street 1e15e0d1f3 Merge remote-tracking branch 'origin/master' into elitepirate 
# Conflicts:
#	Runtime/World/CPatterned.hpp
 2020-04-01 15:02:56 -04:00
Luke Street ffd94d1106 COmegaPirate: Stub 2020-03-31 14:17:47 -04:00
Lioncash 47555c725b CAutoMapper: Eliminate usages of const_cast 
Same behavior, but makes it explicit from the interface that
modifications are clearly going on from within the class.
 2020-03-31 06:57:07 -04:00
Phillip Stephens 7b0c043721
Merge pull request #288 from lioncash/explicit 
Runtime: Add more usages of explicit
 2020-03-31 01:19:40 -07:00
Lioncash 67f6666ea1 Runtime: Add more usages of explicit 
Prevents error-prone implicit conversions where applicable.

This targets the regular RuntimeCommon target this time around.
 2020-03-31 03:53:49 -04:00
Lioncash 260dbaca7d CAnimData: Rename IceModel() to GetIceModel() 
Allows const overloading to work and prevents compilation errors from
occuring if the const qualifier on an instance changes over refactoring.
 2020-03-31 01:26:00 -04:00
Luke Street 2e3d1c980b CElitePirate: Implement AttractProjectiles; fix CGameProjectile material list 2020-03-30 23:10:51 -04:00
Luke Street 684bbd5903 CElitePirate: Bug fixes, make member variables private, cleanup 2020-03-30 20:40:38 -04:00
Lioncash 3e4731bf7f CWallCrawlerSwarm: Minor tidying changes 
- Amends formatting according to clang-format.
- Makes use of const where applicable
- More consistent bracing
 2020-03-30 19:05:48 -04:00
Lioncash e5a0959ef0 CWallCrawlerSwarm: Make use of size_t where applicable 
Avoids unnecessary upper register clearing.
 2020-03-30 19:05:48 -04:00
Lioncash e1273faa68 CWallCrawlerSwarm: Eliminate some sign conversion warnings 
Same behavior, less warnings.
 2020-03-30 19:05:48 -04:00
Lioncash 7ff3d29794 CWallCrawlerSwarm: Mark static const data as constexpr 
Same behavior, but allows elision of initializers. While we're at it, we
can convert an array over to std::array.
 2020-03-30 05:44:35 -04:00