Merge branch 'master' into master

csv/MapObj.csv

@@ -417,14 +417,14 @@ execute__Q215NrvAstroDomeSky27AstroDomeSkyNrvRotateAppearCFP5Spine,AstroDomeSky.
 execute__Q215NrvAstroDomeSky19AstroDomeSkyNrvWaitCFP5Spine,AstroDomeSky.o,MapObj.a,false
 execute__Q215NrvAstroDomeSky21AstroDomeSkyNrvAppearCFP5Spine,AstroDomeSky.o,MapObj.a,false
 execute__Q215NrvAstroDomeSky19AstroDomeSkyNrvHideCFP5Spine,AstroDomeSky.o,MapObj.a,false
-__ct__13AstroMapBoardFPCc,AstroMapBoard.o,MapObj.a,false
-init__13AstroMapBoardFRC12JMapInfoIter,AstroMapBoard.o,MapObj.a,false
-connectToScene__13AstroMapBoardFRC19MapObjActorInitInfo,AstroMapBoard.o,MapObj.a,false
-initAfterPlacement__13AstroMapBoardFv,AstroMapBoard.o,MapObj.a,false
-__dt__13AstroMapBoardFv,AstroMapBoard.o,MapObj.a,false
-__sinit_\AstroMapBoard_cpp,AstroMapBoard.o,MapObj.a,false
-__ct__Q216NrvAstroMapBoard20AstroMapBoardNrvWaitFv,AstroMapBoard.o,MapObj.a,false
-execute__Q216NrvAstroMapBoard20AstroMapBoardNrvWaitCFP5Spine,AstroMapBoard.o,MapObj.a,false
+__ct__13AstroMapBoardFPCc,AstroMapBoard.o,MapObj.a,true
+init__13AstroMapBoardFRC12JMapInfoIter,AstroMapBoard.o,MapObj.a,true
+connectToScene__13AstroMapBoardFRC19MapObjActorInitInfo,AstroMapBoard.o,MapObj.a,true
+initAfterPlacement__13AstroMapBoardFv,AstroMapBoard.o,MapObj.a,true
+__dt__13AstroMapBoardFv,AstroMapBoard.o,MapObj.a,true
+__sinit_\AstroMapBoard_cpp,AstroMapBoard.o,MapObj.a,true
+__ct__Q216NrvAstroMapBoard20AstroMapBoardNrvWaitFv,AstroMapBoard.o,MapObj.a,true
+execute__Q216NrvAstroMapBoard20AstroMapBoardNrvWaitCFP5Spine,AstroMapBoard.o,MapObj.a,true
 __ct__11AstroMapObjFPCc,AstroMapObj.o,MapObj.a,false
 init__11AstroMapObjFRC12JMapInfoIter,AstroMapObj.o,MapObj.a,false
 exeWait__11AstroMapObjFv,AstroMapObj.o,MapObj.a,false
@@ -871,36 +871,36 @@ __cl__Q22MR59FunctorV0M<P16BumpAppearPlanet&#44;M16BumpAppearPlanetFPCvPv_v>CFv,
 clone__Q22MR59FunctorV0M<P16BumpAppearPlanet&#44;M16BumpAppearPlanetFPCvPv_v>CFP7JKRHeap,BumpAppearPlanet.o,MapObj.a,false
 __dt__16BumpAppearPlanetFv,BumpAppearPlanet.o,MapObj.a,false
 getParam__25@unnamed@Candlestand_cpp@FPCc,Candlestand.o,MapObj.a,false
-__ct__11CandlestandFPCc,Candlestand.o,MapObj.a,false
-init__11CandlestandFRC12JMapInfoIter,Candlestand.o,MapObj.a,false
-makeActorAppeared__11CandlestandFv,Candlestand.o,MapObj.a,false
-startClipped__11CandlestandFv,Candlestand.o,MapObj.a,false
-endClipped__11CandlestandFv,Candlestand.o,MapObj.a,false
-attackSensor__11CandlestandFP9HitSensorP9HitSensor,Candlestand.o,MapObj.a,false
-receiveMsgPlayerAttack__11CandlestandFUlP9HitSensorP9HitSensor,Candlestand.o,MapObj.a,false
-receiveMsgEnemyAttack__11CandlestandFUlP9HitSensorP9HitSensor,Candlestand.o,MapObj.a,false
-receiveOtherMsg__11CandlestandFUlP9HitSensorP9HitSensor,Candlestand.o,MapObj.a,false
-emitEffectFire__11CandlestandFv,Candlestand.o,MapObj.a,false
-deleteEffectFire__11CandlestandFv,Candlestand.o,MapObj.a,false
-emitEffectExtinguishFire__11CandlestandFv,Candlestand.o,MapObj.a,false
+__ct__11CandlestandFPCc,Candlestand.o,MapObj.a,true
+init__11CandlestandFRC12JMapInfoIter,Candlestand.o,MapObj.a,true
+makeActorAppeared__11CandlestandFv,Candlestand.o,MapObj.a,true
+startClipped__11CandlestandFv,Candlestand.o,MapObj.a,true
+endClipped__11CandlestandFv,Candlestand.o,MapObj.a,true
+attackSensor__11CandlestandFP9HitSensorP9HitSensor,Candlestand.o,MapObj.a,true
+receiveMsgPlayerAttack__11CandlestandFUlP9HitSensorP9HitSensor,Candlestand.o,MapObj.a,true
+receiveMsgEnemyAttack__11CandlestandFUlP9HitSensorP9HitSensor,Candlestand.o,MapObj.a,true
+receiveOtherMsg__11CandlestandFUlP9HitSensorP9HitSensor,Candlestand.o,MapObj.a,true
+emitEffectFire__11CandlestandFv,Candlestand.o,MapObj.a,true
+deleteEffectFire__11CandlestandFv,Candlestand.o,MapObj.a,true
+emitEffectExtinguishFire__11CandlestandFv,Candlestand.o,MapObj.a,true
 appearItem__11CandlestandFv,Candlestand.o,MapObj.a,false
-exeFire__11CandlestandFv,Candlestand.o,MapObj.a,false
-exeExtinguish__11CandlestandFv,Candlestand.o,MapObj.a,false
-exeFlicker__11CandlestandFv,Candlestand.o,MapObj.a,false
-__dt__11CandlestandFv,Candlestand.o,MapObj.a,false
-__sinit_\Candlestand_cpp,Candlestand.o,MapObj.a,false
-__ct__Q214NrvCandlestand16HostTypeWaitFireFv,Candlestand.o,MapObj.a,false
-__ct__Q214NrvCandlestand12HostTypeFireFv,Candlestand.o,MapObj.a,false
-__ct__Q214NrvCandlestand12HostTypeBurnFv,Candlestand.o,MapObj.a,false
-__ct__Q214NrvCandlestand14HostTypeAttackFv,Candlestand.o,MapObj.a,false
-__ct__Q214NrvCandlestand18HostTypeExtinguishFv,Candlestand.o,MapObj.a,false
-__ct__Q214NrvCandlestand15HostTypeFlickerFv,Candlestand.o,MapObj.a,false
-execute__Q214NrvCandlestand15HostTypeFlickerCFP5Spine,Candlestand.o,MapObj.a,false
-execute__Q214NrvCandlestand18HostTypeExtinguishCFP5Spine,Candlestand.o,MapObj.a,false
-execute__Q214NrvCandlestand14HostTypeAttackCFP5Spine,Candlestand.o,MapObj.a,false
-execute__Q214NrvCandlestand12HostTypeBurnCFP5Spine,Candlestand.o,MapObj.a,false
-execute__Q214NrvCandlestand12HostTypeFireCFP5Spine,Candlestand.o,MapObj.a,false
-execute__Q214NrvCandlestand16HostTypeWaitFireCFP5Spine,Candlestand.o,MapObj.a,false
+exeFire__11CandlestandFv,Candlestand.o,MapObj.a,true
+exeExtinguish__11CandlestandFv,Candlestand.o,MapObj.a,true
+exeFlicker__11CandlestandFv,Candlestand.o,MapObj.a,true
+__dt__11CandlestandFv,Candlestand.o,MapObj.a,true
+__sinit_\Candlestand_cpp,Candlestand.o,MapObj.a,true
+__ct__Q214NrvCandlestand16HostTypeWaitFireFv,Candlestand.o,MapObj.a,true
+__ct__Q214NrvCandlestand12HostTypeFireFv,Candlestand.o,MapObj.a,true
+__ct__Q214NrvCandlestand12HostTypeBurnFv,Candlestand.o,MapObj.a,true
+__ct__Q214NrvCandlestand14HostTypeAttackFv,Candlestand.o,MapObj.a,true
+__ct__Q214NrvCandlestand18HostTypeExtinguishFv,Candlestand.o,MapObj.a,true
+__ct__Q214NrvCandlestand15HostTypeFlickerFv,Candlestand.o,MapObj.a,true
+execute__Q214NrvCandlestand15HostTypeFlickerCFP5Spine,Candlestand.o,MapObj.a,true
+execute__Q214NrvCandlestand18HostTypeExtinguishCFP5Spine,Candlestand.o,MapObj.a,true
+execute__Q214NrvCandlestand14HostTypeAttackCFP5Spine,Candlestand.o,MapObj.a,true
+execute__Q214NrvCandlestand12HostTypeBurnCFP5Spine,Candlestand.o,MapObj.a,true
+execute__Q214NrvCandlestand12HostTypeFireCFP5Spine,Candlestand.o,MapObj.a,true
+execute__Q214NrvCandlestand16HostTypeWaitFireCFP5Spine,Candlestand.o,MapObj.a,true
 __ct__23CannonFortressBreakStepFPCc,CannonFortressBreakStep.o,MapObj.a,false
 init__23CannonFortressBreakStepFRC12JMapInfoIter,CannonFortressBreakStep.o,MapObj.a,false
 exeWait__23CannonFortressBreakStepFv,CannonFortressBreakStep.o,MapObj.a,false
@@ -5903,7 +5903,7 @@ __ct__25WaterPressureBulletHolderFPCc,WaterPressureBulletHolder.o,MapObj.a,true
 callEmptyBullet__25WaterPressureBulletHolderFv,WaterPressureBulletHolder.o,MapObj.a,true
 __dt__25WaterPressureBulletHolderFv,WaterPressureBulletHolder.o,MapObj.a,true
 init__25WaterPressureBulletHolderFRC12JMapInfoIter,WaterPressureBulletHolder.o,MapObj.a,true
-__ct__17WaveFloatingForceFPC9LiveActorlfb,WaveFloatingForce.o,MapObj.a,false
+__ct__17WaveFloatingForceFPC9LiveActorlfb,WaveFloatingForce.o,MapObj.a,true
 update__17WaveFloatingForceFv,WaveFloatingForce.o,MapObj.a,false
 getCurrentValue__17WaveFloatingForceCFv,WaveFloatingForce.o,MapObj.a,false
 updateNormal__17WaveFloatingForceFv,WaveFloatingForce.o,MapObj.a,false

include/Game/MapObj/WaveFloatingForce.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "Game/LiveActor/LiveActor.hpp"
+
+class WaveFloatingForce {
+public:
+    WaveFloatingForce(const LiveActor *, s32, f32, bool);
+
+    void update();
+    f32 getCurrentValue() const;
+    void updateNormal();
+    void updateOnPlayer();
+
+    const LiveActor* mActor;            // _0
+    s32 _4;
+    f32 _8;
+    f32 _C;
+    bool _10;
+};

include/Game/Util/MathUtil.hpp

@@ -319,6 +319,10 @@ namespace MR {
         return false;
     }
 
+    inline f64 normalizePhase(f32 value, f32 initial, f32 offset, f32 modulus) {
+        return (initial + fmod((offset + (value - initial)), modulus));
+    }
+
     f32 cos(f32);
     f32 sin(f32);
 };

libs/JSystem/include/JSystem/JMath/JMATrigonometric.hpp

@@ -29,12 +29,12 @@ namespace JMath {
         inline f32 sinLap(f32 v)
         {
             if (v < 0.0f) {
-                v *= -LEN / TWO_PI;
-                return -table[(u16)v & LEN - 1].a1;
+                f32 tmp = v * -LEN / TWO_PI;
+                return -table[(u16)tmp & LEN - 1].a1;
             }
             else {
-                v *= LEN / TWO_PI;
-                return table[(u16)v & LEN - 1].a1;
+                f32 tmp = v * LEN / TWO_PI;
+                return table[(u16)tmp & LEN - 1].a1;
             }
         }
 

source/Game/MapObj/WaveFloatingForce.cpp

@@ -0,0 +1,45 @@
+#include "Game/MapObj/WaveFloatingForce.hpp"
+#include <JSystem/JMath/JMATrigonometric.hpp>
+
+WaveFloatingForce::WaveFloatingForce(const LiveActor *pActor, s32 a2, f32 a3, bool a4) {
+    mActor = pActor;
+    _4 = a2;
+    _8 = a3;
+    _C = 0.0f;
+    _10 = false;
+    _C = 6.2831855f * MR::getRandom();
+}
+
+/*
+void WaveFloatingForce::update() {
+    if (_10 || !MR::isOnPlayer(mActor)) {
+        updateOnPlayer();
+    }
+    else {
+        updateNormal();
+    }
+}
+*/
+
+#ifdef NON_MATCHING
+f32 WaveFloatingForce::getCurrentValue() const {
+    return _8 * JMath::sSinCosTable.sinLap(_C);
+}
+#endif
+
+#define TWO_PI 6.2831855f
+#define TWO_PI_APPROX 6.283185482025146
+#define TWO_POW_52 4.503601774854144e15
+
+/*
+void WaveFloatingForce::updateNormal() {
+    f32 v2 = _4;
+    f32 v1 = (_C + (TWO_PI / (v2 - TWO_POW_52)));
+    _C = _C + (TWO_PI / (v2 - TWO_POW_52));
+    _C += MR::normalizePhase(v1, 0.0f, TWO_PI, TWO_PI_APPROX);
+}
+
+void WaveFloatingForce::updateOnPlayer() {
+
+}
+*/