WipeFade.o at 93%

csv/Screen.csv

@@ -2959,21 +2959,21 @@ execute__Q220NrvWaterCameraFilter25WaterCameraFilterNrvWaterCFP5Spine,WaterCamer
 execute__Q220NrvWaterCameraFilter30WaterCameraFilterNrvAirToWaterCFP5Spine,WaterCameraFilter.o,Screen.a,false
 execute__Q220NrvWaterCameraFilter23WaterCameraFilterNrvAirCFP5Spine,WaterCameraFilter.o,Screen.a,false
 __dt__17WaterCameraFilterFv,WaterCameraFilter.o,Screen.a,false
-__ct__8WipeFadeFPCcRC6Color8,WipeFade.o,Screen.a,false
-__dt__14WipeLayoutBaseFv,WipeFade.o,Screen.a,false
-init__8WipeFadeFRC12JMapInfoIter,WipeFade.o,Screen.a,false
-control__8WipeFadeFv,WipeFade.o,Screen.a,false
+__ct__8WipeFadeFPCcRC6Color8,WipeFade.o,Screen.a,true
+__dt__14WipeLayoutBaseFv,WipeFade.o,Screen.a,true
+init__8WipeFadeFRC12JMapInfoIter,WipeFade.o,Screen.a,true
+control__8WipeFadeFv,WipeFade.o,Screen.a,true
 draw__8WipeFadeCFv,WipeFade.o,Screen.a,false
-wipe__8WipeFadeFl,WipeFade.o,Screen.a,false
-forceClose__8WipeFadeFv,WipeFade.o,Screen.a,false
-forceOpen__8WipeFadeFv,WipeFade.o,Screen.a,false
-isOpen__8WipeFadeCFv,WipeFade.o,Screen.a,false
-isClose__8WipeFadeCFv,WipeFade.o,Screen.a,false
-isWipeIn__8WipeFadeCFv,WipeFade.o,Screen.a,false
-isWipeOut__8WipeFadeCFv,WipeFade.o,Screen.a,false
-__dt__8WipeFadeFv,WipeFade.o,Screen.a,false
-getWipeType__14WipeLayoutBaseCFv,WipeFade.o,Screen.a,false
-getWipeName__14WipeLayoutBaseCFv,WipeFade.o,Screen.a,false
+wipe__8WipeFadeFl,WipeFade.o,Screen.a,true
+forceClose__8WipeFadeFv,WipeFade.o,Screen.a,true
+forceOpen__8WipeFadeFv,WipeFade.o,Screen.a,true
+isOpen__8WipeFadeCFv,WipeFade.o,Screen.a,true
+isClose__8WipeFadeCFv,WipeFade.o,Screen.a,true
+isWipeIn__8WipeFadeCFv,WipeFade.o,Screen.a,true
+isWipeOut__8WipeFadeCFv,WipeFade.o,Screen.a,true
+__dt__8WipeFadeFv,WipeFade.o,Screen.a,true
+getWipeType__14WipeLayoutBaseCFv,WipeFade.o,Screen.a,true
+getWipeName__14WipeLayoutBaseCFv,WipeFade.o,Screen.a,true
 __ct__12WipeGameOverFv,WipeGameOver.o,Screen.a,false
 init__12WipeGameOverFRC12JMapInfoIter,WipeGameOver.o,Screen.a,false
 kill__12WipeGameOverFv,WipeGameOver.o,Screen.a,false

data/Game.json

@@ -1,6 +1,6 @@
 {
 	"schemaVersion": 1,
 	"label": "Game",
-	"message": "16.579%",
+	"message": "16.6%",
 	"color": "blue"
 }

data/json/Screen.json

@@ -1,6 +1,6 @@
 {
 	"schemaVersion": 1,
 	"label": "Screen",
-	"message": "8.636%",
+	"message": "8.921%",
 	"color": "yellow"
 }

docs/PROGRESS.md

@@ -21,7 +21,7 @@
 | [RhythmLib](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/RhythmLib.md) | 1.2661566868900025% |
 | [Ride](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Ride.md) | 6.181993549748319% |
 | [Scene](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Scene.md) | 19.62025316455696% |
-| [Screen](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen.md) | 8.636619055708742% |
+| [Screen](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen.md) | 8.92150072527214% |
 | [Speaker](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Speaker.md) | 54.75241889584519% |
 | [System](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/System.md) | 14.730098411770436% |
 | [Util](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Util.md) | 10.090099514848767% |

docs/lib/Game/Screen.md

@@ -138,7 +138,7 @@
 | [TimeLimitLayout.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/TimeLimitLayout.md) | 0.0% | 0 / 37 | 0.0% | :x: 
 | [TitleSequenceProduct.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/TitleSequenceProduct.md) | 0.0% | 0 / 31 | 0.0% | :x: 
 | [WaterCameraFilter.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WaterCameraFilter.md) | 0.0% | 0 / 17 | 0.0% | :x: 
-| [WipeFade.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WipeFade.md) | 0.0% | 0 / 15 | 0.0% | :x: 
+| [WipeFade.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WipeFade.md) | 76.22377622377621% | 14 / 15 | 93.33333333333333% | :eight_pointed_black_star: 
 | [WipeGameOver.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WipeGameOver.md) | 0.0% | 0 / 17 | 0.0% | :x: 
 | [WipeHolderBase.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WipeHolderBase.md) | 0.0% | 0 / 13 | 0.0% | :x: 
 | [WipeKoopa.o](https://github.com/shibbo/Petari/blob/master/docs/lib/Game/Screen/WipeKoopa.md) | 0.0% | 0 / 19 | 0.0% | :x: 

docs/lib/Game/Screen/WipeFade.md

@@ -5,22 +5,22 @@
 | :white_check_mark: | Function is completed. 
 
 
-# 0 / 15 Completed -- (0.0%)
+# 14 / 15 Completed -- (93.33333333333333%)
 # WipeFade.o
 | Symbol | Decompiled? |
 | ------------- | ------------- |
-| `__ct__8WipeFadeFPCcRC6Color8` | :x: |
-| `__dt__14WipeLayoutBaseFv` | :x: |
-| `init__8WipeFadeFRC12JMapInfoIter` | :x: |
-| `control__8WipeFadeFv` | :x: |
+| `__ct__8WipeFadeFPCcRC6Color8` | :white_check_mark: |
+| `__dt__14WipeLayoutBaseFv` | :white_check_mark: |
+| `init__8WipeFadeFRC12JMapInfoIter` | :white_check_mark: |
+| `control__8WipeFadeFv` | :white_check_mark: |
 | `draw__8WipeFadeCFv` | :x: |
-| `wipe__8WipeFadeFl` | :x: |
-| `forceClose__8WipeFadeFv` | :x: |
-| `forceOpen__8WipeFadeFv` | :x: |
-| `isOpen__8WipeFadeCFv` | :x: |
-| `isClose__8WipeFadeCFv` | :x: |
-| `isWipeIn__8WipeFadeCFv` | :x: |
-| `isWipeOut__8WipeFadeCFv` | :x: |
-| `__dt__8WipeFadeFv` | :x: |
-| `getWipeType__14WipeLayoutBaseCFv` | :x: |
-| `getWipeName__14WipeLayoutBaseCFv` | :x: |
+| `wipe__8WipeFadeFl` | :white_check_mark: |
+| `forceClose__8WipeFadeFv` | :white_check_mark: |
+| `forceOpen__8WipeFadeFv` | :white_check_mark: |
+| `isOpen__8WipeFadeCFv` | :white_check_mark: |
+| `isClose__8WipeFadeCFv` | :white_check_mark: |
+| `isWipeIn__8WipeFadeCFv` | :white_check_mark: |
+| `isWipeOut__8WipeFadeCFv` | :white_check_mark: |
+| `__dt__8WipeFadeFv` | :white_check_mark: |
+| `getWipeType__14WipeLayoutBaseCFv` | :white_check_mark: |
+| `getWipeName__14WipeLayoutBaseCFv` | :white_check_mark: |

include/Game/Screen/WipeFade.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include "Game/Screen/WipeLayoutBase.hpp"
+#include "Game/Util.hpp"
+
+class WipeFade : public WipeLayoutBase {
+public:
+    WipeFade(const char*, const Color8&);
+
+    virtual ~WipeFade();
+    virtual void init(const JMapInfoIter&);
+    virtual void draw() const;
+    virtual void control();
+    virtual void wipe(s32);
+    virtual void forceClose();
+    virtual void forceOpen();
+    virtual bool isOpen() const;
+    virtual bool isClose() const;
+    virtual bool isWipeIn() const;
+    virtual bool isWipeOut() const;
+
+    bool _20;
+    s32 _24;
+    s32 _28;
+    Color8 _2C;
+};

include/Game/Screen/WipeLayoutBase.hpp

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "Game/Screen/LayoutActor.hpp"
+
+class WipeLayoutBase : public LayoutActor {
+public:
+    inline WipeLayoutBase(const char* pName) : LayoutActor(pName, true) {}
+
+    virtual ~WipeLayoutBase() {}
+    virtual void wipe(s32) = 0;
+    virtual void forceClose() = 0;
+    virtual void forceOpen() = 0;
+    virtual bool isOpen() const = 0;
+    virtual bool isClose() const = 0;
+    virtual bool isWipeIn() const = 0;
+    virtual bool isWipeOut() const = 0;
+
+    virtual const char* getWipeName() const { return mName; }
+    virtual s32 getWipeType() const { return 0; }
+};

include/Game/Screen/WipeRing.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include "Game/Screen/LayoutActor.hpp"
+
+class WipeRing : public LayoutActor {
+public:
+    WipeRing(bool, const char*);
+
+    virtual ~WipeRing();
+    virtual void init(const JMapInfoIter&);
+    virtual void wipe(s32);
+    virtual void forceClose();
+
+    TVec2f mFollowPos;  // 0x20
+    s32 mWipeStep;      // 0x28
+    f32 _2C;
+    f32 _30;
+    u8 _34;
+};

include/Game/Util/DrawUtil.hpp

@@ -7,13 +7,13 @@ class J3DModelData;
 namespace MR {
     void setupShadowVolumeDraw();
 
-    void drawSimpleModel(J3DModelData *);
+    void drawSimpleModel(J3DModelData*);
 
     void loadTexProjectionMtx(u32);
 
     void reinitGX();
 
-    
+    void fillScreen(const _GXColor&);
 
     void clearZBuffer();
-};
+};  // namespace MR

source/Game/Screen/WipeFade.cpp

@@ -0,0 +1,118 @@
+#include "Game/Screen/WipeFade.hpp"
+
+WipeFade::WipeFade(const char* pName, const Color8& rColor) : WipeLayoutBase(pName) {
+    _20 = false;
+    _24 = 30;
+    _28 = 30;
+    _2C = rColor;
+}
+
+void WipeFade::init(const JMapInfoIter& rIter) {
+    kill();
+}
+
+void WipeFade::control() {
+    _28++;
+
+    if (isOpen()) {
+        kill();
+    }
+}
+
+/*
+void WipeFade::draw() const {
+    if (!MR::isDead(this)) {
+        f32 v3 = 0.0f;
+        f32 v4 = _28 / _24;
+
+        if (v4 >= 0.0f) {
+            v3 = 1.0f;
+
+            if (v4 <= 1.0f) {
+                v3 = _28 / _24;
+            }
+        }
+
+        if (_20) {
+            v3 = (1.0f - v3);
+        }
+
+        GXSetColorUpdate(GX_TRUE);
+        GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP);
+        GXColor color = _2C;
+        MR::fillScreen(color);
+    }
+}
+*/
+
+void WipeFade::wipe(s32 a1) {
+    _20 = !_20;
+
+    if (a1 < 0) {
+        _24 = 30;
+    } else {
+        if (a1 == 0) {
+            _24 = 1;
+
+        } else {
+            _24 = a1;
+        }
+    }
+
+    _28 = 0;
+
+    if (MR::isDead(this)) {
+        appear();
+    }
+}
+
+void WipeFade::forceClose() {
+    _20 = 0;
+    _28 = _24;
+
+    if (MR::isDead(this)) {
+        appear();
+    }
+}
+
+void WipeFade::forceOpen() {
+    _20 = 1;
+    _28 = _24;
+    kill();
+}
+
+bool WipeFade::isOpen() const {
+    bool ret = false;
+    if (_20 && _28 >= _24) {
+        ret = true;
+    }
+
+    return ret;
+}
+
+bool WipeFade::isClose() const {
+    bool ret = false;
+    if (!_20 && _28 >= _24) {
+        ret = true;
+    }
+
+    return ret;
+}
+
+bool WipeFade::isWipeIn() const {
+    bool ret = false;
+    if (_20 && _28 < _24) {
+        ret = true;
+    }
+    return ret;
+}
+
+bool WipeFade::isWipeOut() const {
+    bool ret = false;
+    if (!_20 && _28 < _24) {
+        ret = true;
+    }
+    return ret;
+}
+
+WipeFade::~WipeFade() {}