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

334 Commits

Author SHA1 Message Date
Luke Street 732831de9a Revert "Remove arbitrary particle limit of 256, unfortunately this breaks various particle systems including Essence Shockwave and flamethrower particles" 
This reverts commit 35482529
 2021-02-15 21:54:44 -05:00
Phillip Stephens 3548252931
Remove arbitrary particle limit of 256, unfortunately this breaks various particle systems including Essence Shockwave and flamethrower particles 2021-01-14 15:52:26 -08:00
Phillip Stephens 215eedc013
Fix inconsistent state causing Exo to fling herself off into the void 2020-12-13 10:57:45 -08:00
Phillip Stephens 8633bbddec
More CMetroidPrimeExo imps 2020-12-13 10:57:44 -08:00
Phillip Stephens 0903b478f6
More MetroidPrimeExo imps 2020-12-13 10:57:44 -08:00
Luke Street dad16bf59b CEnergyProjectile: Properly set hitProjectileOwner 
Fixes #359
 2020-09-26 10:38:22 -04:00
Luke Street 902b5644f7 CEnergyProjectile: Minor cleanup 2020-09-26 09:41:50 -04:00
Luke Street 732be1f7ea CEnergyProjectile: Mark functions as override 2020-09-26 01:48:18 -04:00
Luke Street edea2e3745 CGameProjectile: Implement Render 2020-09-26 01:34:13 -04:00
Luke Street c474b19b9d CTargetableProjectile: Implement ResolveCollisionWithActor & fixes 2020-09-25 14:14:24 -04:00
Phillip Stephens 9ab8c4cd8b
Fix PowerBomb radius derp 2020-09-23 16:32:15 -07:00
Luke Street 76de1541f2 Runtime: Resolve -Wrange-loop-analysis warnings (part 2) 2020-09-18 17:04:50 -04:00
Phillip Stephens dc4b79eec3
Merge branch 'new-flamethrower' of https://github.com/shiiion/urde into shiiion-new-flamethrower 2020-09-10 11:03:28 -07:00
Lioncash 4e9b22962c CModelData: Remove usages of const_cast 
Allows readers to know that these functions do affect member state.
 2020-08-01 23:45:49 -04:00
Luke Street dbd52f8917 CBomb: Correctly initialize x170_prevLocation 2020-07-12 23:24:07 -04:00
shiiion cf86338a84 initial flamethrower weapon implementation 2020-06-25 22:37:45 -04:00
Luke Street ca96676057 Merge remote-tracking branch 'origin/icesheegoth' 2020-06-06 16:27:08 -04:00
Lioncash 25ea6d98bc CFlameThrower: Silence unused variable warning 2020-05-09 22:28:56 -04:00
Lioncash 0f11a00cc0 CBeamProjectile: Silence unused variable warning 2020-05-09 22:27:54 -04:00
Lioncash 665b4f496d CFlameThrower: Assign thermal hot to xe6_27_thermalVisorFlags instead of ORing 
Previously the code was neglecting to clear the flags entirely before
assigning the new value to it.
 2020-05-09 22:05:55 -04:00
Lioncash 77861a9b9f CWaveBuster: Add AcceptScriptMsg implementation 2020-05-09 21:55:19 -04:00
Lioncash cd13a49649 CWaveBuster: Add Accept implementation 
More low hanging fruit that can be resolved.
 2020-05-09 21:17:22 -04:00
Lioncash 3dddfa63cf CWaveBuster: Add AddToRenderer implementation 
Low hanging fruit and fairly trivial to implement.
 2020-05-09 21:12:12 -04:00
Lioncash 5d209c8dc8 General: Mark a handful of deduced const variables as const explicitly 
Same behavior, but makes it explicit to the reader that these are const.

Prevents cases where the reader might assume that just because the
variable isn't const qualified that it must be mutable, when it actually
isn't.
 2020-05-08 18:41:29 -04:00
Lioncash fef9e6ff2d CAuxWeapon: Make skComboNames contain std::string_view instances 
Removes unnecessary runtime strlen calls.
 2020-05-08 17:01:49 -04:00
Lioncash d7c9135d27 CBomb: Fix boolean parameter not being used within SetFuseDisabled() 
Prevents silent logic bugs, particularly given this function is called
with true as well inside CTryclops::InMaxRange.
 2020-04-24 01:12:04 -04:00
Lioncash 2b2edfa871 CGrappleArm: Invert conditionals where applicable 
Makes early-exit conditions nicer to follow and also unindents some
code.
 2020-04-23 01:57:18 -04:00
Phillip Stephens b1a897d246
CIceSheegoth: Implement Think 2020-04-22 15:06:15 -07:00
Luke Street 14c92e85ce Use pas::EAnimationState in CPAS* 2020-04-22 05:09:27 -04:00
Luke Street fc7e8d4993 CElectricBeamProjectile: Finish implementation 2020-04-21 22:04:37 -04:00
Luke Street 5f66ab2219 CMagdolite: Minor cleanup 2020-04-21 01:32:16 -04:00
Phillip Stephens d1c796f2a9 Initial CMagdolite imps 2020-04-21 01:06:52 -04:00
Luke Street d3a44259c3
Merge pull request #315 from lioncash/init 
RuntimeCommonB: Make use of bitfield initializers where applicable
 2020-04-21 00:56:39 -04:00
Lioncash 554893ef85 RuntimeCommonB: Make use of bitfield initializers where applicable 
Given that we now target C++20, we can make use of bitfield initializers
where applicable.
 2020-04-20 15:57:25 -04:00
Luke Street 7b1e041123
Merge pull request #301 from AxioDL/omegapirate 
OmegaPirate implementation
 2020-04-20 03:21:04 -04:00
Lioncash dca87e7dce CPlayerGun: Convert missed literal to a boolean literal 
whoops.
 2020-04-19 23:39:04 -04:00
Lioncash 1f8f3726e6 CPlayerGun: Make use of bool literal where appropriate 
Avoids a conversion to bool from int.
 2020-04-19 23:35:07 -04:00
Luke Street 32c44cbf05 Merge branch 'master' into omegapirate 
# Conflicts:
#	Runtime/GuiSys/CAuiImagePane.cpp
 2020-04-19 22:12:18 -04:00
Luke Street 24acb585f8 MSVC & zeus fixes; update hecl-gui 2020-04-19 21:09:30 -04:00
Lioncash ec5d680be0 CBurstFire: Unindent conditionals where applicable 
Makes it nicer to read early-exit conditions.
 2020-04-19 00:40:46 -04:00
Luke Street e50d363e88 CPlayerGun: Rename EMissileState; minor CMotionState::Update fix 2020-04-19 00:26:53 -04:00
Luke Street 30f2ac3f26 Merge branch 'master' into omegapirate 2020-04-18 18:14:51 -04:00
Lioncash 76f0b57340 General: Use bool literals where applicable 
More indicative of the passed in type compared to raw values.
 2020-04-17 17:43:56 -04:00
Lioncash c14721611b CEnergyProjectile: Make use of const where applicable 
While we're at it, make use of consistent bracing, given some
conditionals traveled over one line.
 2020-04-14 15:47:45 -04:00
Lioncash 2ad45e481f CAuxWeapon: Use names for sound IDs 
Same behavior, but slightly more self-documenting on what they actually
are.
 2020-04-13 10:36:38 -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 a433a7852f CIceBeam/CPhazonBeam: Make use of std::array where applicable 
Same behavior, stronger typing.
 2020-04-12 11:34:59 -04:00
Lioncash b631b5f3a1 CGunWeapon: Mark skShootAnim as constexpr 
Enforce it as constexpr. The initializer is likely optimized away
anyways, given the array only contains primitives, but this is more
consistent.
 2020-04-12 11:31:28 -04:00
Lioncash 9e168d3497 CPlasmaProjectile: Make PlayerEffectResource instances contain CAssetIds 
Uses the wrapper type instead of the raw type.
 2020-04-12 07:30:00 -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 54dededb9b CNewFlameThrower: Make constructor take a std::array by reference 
Same behavior, but enforces the size requirement instead of accepting
any arbitrary const CAssetId* pointer.
 2020-04-11 19:37:42 -04:00
Lioncash fa0dcf5b12 WeaponCommon: Use string_view with get_asset_id_from_name() 
Internal functions expect a std::string_view, so we can just make the
parameter a string_view as well to push the responsibility outwards into
the caller.
 2020-04-11 19:33:00 -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
Luke Street 22880abb7e Runtime/Weapon: Replace bitfield unions with constructor initializers 2020-04-11 00:49:02 -04:00
Lioncash 1bacb69fc2 CPlasmaProjectile: Remove mutable specifier from m_renderObjs 
Now that Render() is non-const, this is no longer necessary.
 2020-04-09 21:17:20 -04:00
Lioncash 4834720bb0 CGrappleArm: Remove usage of const_cast in RenderXRayModel() 
This is no longer necessary.
 2020-04-09 20:18:45 -04:00
Lioncash 0c1b47faf8 CProjectileWeapon: Remove usages of const_cast 
Now that the base Render() function was made non-const, it's trivial to
apply this to the other classes like CProjectileWeapon.
 2020-04-09 20:09:14 -04:00
Luke Street 6b814262fc Merge remote-tracking branch 'origin/master' into omegapirate 2020-04-09 20:06:33 -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 74bce8458b
Merge pull request #299 from lioncash/const2 
CGunWeapon: Eliminate usages of const_cast
 2020-04-09 10:46:52 -04:00
Lioncash ad1f56bfda CPowerBeam: Make use of std::array where applicable 
Same behavior, stronger typing.

We can also narrow the scope of the array.
 2020-04-07 13:57:06 -04:00
Lioncash 5405dad069 CWeaponMgr: Make use of size_t in IncrCount() 
Keeps this function consistent with the previous change.
 2020-04-07 13:40:14 -04:00
Lioncash 8ba2af9b5a CWeaponMgr: Avoid unnecessary repeated std::map lookups 
Avoids trivial redundant std::map indexes by doing the lookup once and
then referring to the looked up object instead of doing repeated
lookups.
 2020-04-07 13:38:36 -04:00
Luke Street a4b1e7f85f COmegaPirate: Implement Faint, Growth, JumpBack, Suck; continue Think implementation 2020-04-06 16:56:10 -04:00
Lioncash 2e6bd0f05e CGunWeapon: Eliminate usages of const_cast 
Eliminates trivial usages of const_cast by making Draw related functions
non-const. This also allows removing the mutable specifiers from several
shader data members.
 2020-04-06 00:52:47 -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
Phillip Stephens 28853f5ea6
Merge branch 'constexpr5' of https://github.com/lioncash/urde into lioncash-constexpr5 2020-04-05 05:10:42 -07:00
Lioncash b122fd30a8 CGameProjectile: Return std::nullopt in GetTouchBounds() 
Same behavior, but doesn't potentially unnecessary zero out the entirety
of the buffer within the optional and only sets a single byte.
 2020-04-03 02:07:54 -04:00
Lioncash d47f8c2784 CGameProjectile: Make use of TCastToConstPtr before 
Same behavior, but more indiciative of read-only semantics.
 2020-04-03 01:58:00 -04:00
Lioncash d240e40a17 CCameraShakeData: Make classes and structs constexpr where applicable 
Same behavior, but allows eliminating file-scope initializers needing to
be run on program start.
 2020-04-02 21:40:19 -04:00
Lioncash f1e28a1290 CPlasmaBeam: Make use of std::array where applicable 
Same behavior, no implicit array to pointer decay.
 2020-04-02 21:10:51 -04:00
Lioncash a8594d144b CPlasmaProjectile: Make use of std::array where applicable 
Allows dehardcoding array sizes.
 2020-04-02 20:55:28 -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
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
Luke Street 2e3d1c980b CElitePirate: Implement AttractProjectiles; fix CGameProjectile material list 2020-03-30 23:10:51 -04:00
Lioncash 194cdf145f Runtime: Use nullptr where applicable 
Same behavior, but no magic 0 value.

While we're in the same area, we can do minor cosmetic changes.
 2020-03-27 20:18:54 -04:00
Lioncash 241a66dc0a General: Make use of explicit constructors where applicable 
Gets rid of potential error prone implicitly constructing constructors.
 2020-03-27 06:00:17 -04:00
Lioncash 98b9556f3e CProjectileWeapon: Return std::nullopt instead of {} where applicable 
Prevents some implementations from zeroing out their internal buffer
unnecessarily (libstdc++ and libc++).
 2020-03-25 16:03:09 -04:00
Lioncash 6365f2ee1c CPowerBomb: Return std::nullopt in GetTouchBounds() 
Avoids unnecessary zeroing of the internal buffer of std::optional in
some implementations (libstdc++ and libc++).
 2020-03-25 15:56:59 -04:00
Luke Street 7ee2a3b912
Merge pull request #254 from AxioDL/flyingpirate 
CFlyingPirate implementation
 2020-03-25 03:01:10 -04:00
Phillip Stephens dbbf9e33fd
Merge pull request #262 from lioncash/nullopt 
CBeamProjectile: Explicitly return std::nullopt in GetTouchBounds()
 2020-03-23 23:27:54 -07:00
Lioncash bf590dd855 CBeamProjectile: Explicitly return std::nullopt in GetTouchBounds() 
Allows some implementations to completely avoid zeroing out the internal
buffer within the std::optional instance.
 2020-03-21 01:46:59 -04:00
Lioncash 5b7e440ff7 CBomb: Make file-scope material filter constexpr 
Allows the data to be placed into the read-only segment.
 2020-03-21 01:42:46 -04:00
Luke Street 13d8c3fdd1 CFlyingPirate: First draft almost done 2020-03-18 01:18:48 -04:00
Luke Street 11ea9d3aa6 CFlyingPirate: More method implementations 2020-03-18 01:18:48 -04:00
Lioncash fc466ff062 CFlameThrower: Resolve sign-conversion warnings in DoCollisionCheck() 
Resolves trivial sign conversion warnings and also makes some variables
const where applicable.
 2020-03-17 21:55:24 -04:00
Lioncash 258409bc7d CGrappleArm: Remove const_cast within RenderXRayModel() 
Same behavior, but without a cast.
 2020-03-16 19:53:04 -04:00
Lioncash 9063b16d36 CGrappleArm: Convert reinterpret_cast to static_cast in PointGenerator() 
It's permissible to use static_cast when converting from void* to
another type.
 2020-03-16 19:16:46 -04:00
Lioncash 0cbfc6d169 CGrappleArm: Move skDependencyNames into BuildSuitDependencyList() 
Same behavior, but narrows the visible scope of the array.
 2020-03-16 19:12:55 -04:00
Lioncash d0d6210ccd CGrappleArm: Resolve sign mismatch warnings in loops 2020-03-16 19:11:16 -04:00
Lioncash 097d4a4422 Runtime: Collapse emplace_back() calls where applicable 
Same behavior, but with less code.
 2020-03-13 17:14:44 -04:00
Phillip Stephens eb38d96d9a
Merge pull request #214 from lioncash/virtual 
CGunWeapon: Make destructor virtual
 2020-03-12 15:11:02 -07:00
Phillip Stephens 7601888e34
Merge pull request #212 from lioncash/power-color 
CPowerBomb: Make kFadeColor internally linked
 2020-03-12 15:10:40 -07:00
Phillip Stephens ce5ce35743
Merge pull request #210 from lioncash/bob 
CPlayerCameraBob: Minor cleanup
 2020-03-12 15:10:19 -07:00