CCameraFilter 92% (GX weirdness)

Author: encounter

config/GM8E01_00/symbols.txt

@@ -16995,31 +16995,9 @@ lbl_803CE5C8 = .rodata:0x803CE5C8; // type:object size:0x7 data:string
 @stringBase0 = .rodata:0x803CE5D0; // type:object size:0x1A scope:local data:string_table
 sDoorData = .rodata:0x803CE5F0; // type:object size:0x60 scope:global
 lbl_803CE650 = .rodata:0x803CE650; // type:object size:0x58
-lbl_803CE6A8 = .rodata:0x803CE6A8; // type:object size:0x90
-lbl_803CE738 = .rodata:0x803CE738; // type:object size:0xC data:string
-lbl_803CE744 = .rodata:0x803CE744; // type:object size:0xC data:string
-lbl_803CE750 = .rodata:0x803CE750; // type:object size:0xC data:string
-lbl_803CE75C = .rodata:0x803CE75C; // type:object size:0xC data:string
-lbl_803CE768 = .rodata:0x803CE768; // type:object size:0xC data:string
-lbl_803CE774 = .rodata:0x803CE774; // type:object size:0xC data:string
-lbl_803CE780 = .rodata:0x803CE780; // type:object size:0xC data:string
-lbl_803CE78C = .rodata:0x803CE78C; // type:object size:0xC data:string
-lbl_803CE798 = .rodata:0x803CE798; // type:object size:0xC data:string
-lbl_803CE7A4 = .rodata:0x803CE7A4; // type:object size:0x21 data:string
-lbl_803CE7C5 = .rodata:0x803CE7C5; // type:object size:0x21 data:string
-lbl_803CE7E6 = .rodata:0x803CE7E6; // type:object size:0x21 data:string
-lbl_803CE807 = .rodata:0x803CE807; // type:object size:0x21 data:string
-lbl_803CE828 = .rodata:0x803CE828; // type:object size:0x21 data:string
-lbl_803CE849 = .rodata:0x803CE849; // type:object size:0x21 data:string
-lbl_803CE86A = .rodata:0x803CE86A; // type:object size:0x21 data:string
-lbl_803CE88B = .rodata:0x803CE88B; // type:object size:0x21 data:string
-lbl_803CE8AC = .rodata:0x803CE8AC; // type:object size:0x21 data:string
-lbl_803CE8CD = .rodata:0x803CE8CD; // type:object size:0x9 data:string
-lbl_803CE8D6 = .rodata:0x803CE8D6; // type:object size:0x9 data:string
-lbl_803CE8DF = .rodata:0x803CE8DF; // type:object size:0x9 data:string
-lbl_803CE8E8 = .rodata:0x803CE8E8; // type:object size:0x9 data:string
-lbl_803CE8F1 = .rodata:0x803CE8F1; // type:object size:0x1
-lbl_803CE8F2 = .rodata:0x803CE8F2; // type:object size:0x1E
+skBlurTextureAssetNames = .rodata:0x803CE6A8; // type:object size:0x10 scope:local
+lbl_803CE6B8 = .rodata:0x803CE6B8; // type:object size:0x80
+@stringBase0 = .rodata:0x803CE738; // type:object size:0x1D8 scope:local data:string_table
 lbl_803CE910 = .rodata:0x803CE910; // type:object size:0xC0 data:4byte
 lbl_803CE9D0 = .rodata:0x803CE9D0; // type:object size:0x40
 lbl_803CEA10 = .rodata:0x803CEA10; // type:object size:0x80 data:4byte

include/Kyoto/Graphics/CGraphics.hpp

@@ -339,6 +339,12 @@ class CGraphics {
   static void VideoPostCallback(u32 retraceCount);
 
   static const CViewport& GetViewport() { return mViewport; }
+  static void GetViewport(int& left, int& bottom, int& width, int& height) {
+    left = mViewport.mLeft;
+    bottom = mViewport.mTop;
+    width = mViewport.mWidth;
+    height = mViewport.mHeight;
+  }
   static const CVector3f& GetViewPoint() { return mViewPoint; }
   static const CTransform4f& GetViewMatrix() { return mViewMatrix; }
   static const CTransform4f& GetModelMatrix() { return mModelMatrix; }

include/Kyoto/Graphics/CTevCombiners.hpp

@@ -185,6 +185,4 @@ class CTevCombiners {
   static uint sNumEnabledPasses;
 };
 
-extern CTevCombiners::CTevPass CTevPass_805a5ebc;
-
 #endif // _CTEVCOMBINERS

include/MetroidPrime/Cameras/CCameraBlurPass.hpp

@@ -5,6 +5,8 @@
 
 #include "MetroidPrime/TGameTypes.hpp"
 
+#include "dolphin/gx/GXEnum.h"
+
 #include "Kyoto/Graphics/CColor.hpp"
 #include "Kyoto/TToken.hpp"
 
@@ -23,15 +25,20 @@ class CCameraBlurPass {
   };
   CCameraBlurPass();
 
+  void Update(float dt);
   void SetBlur(EBlurType type, float amount, float duration, bool usePersistentFb);
   void DisableBlur(float duration);
   void Draw() const;
 
   static void DrawWideScreen(const CColor& color, const CTexture* tex, float v);
-  
+
   EBlurType GetCurrType() const { return x10_curType; }
   bool GetNoPersistentCopy() const { return x2d_noPersistentCopy; }
 
+  void GetFbCopy(_GXTexFmt fmt, uchar* buf) const;
+  void FreePersistentFbTexture();
+  void AllocatePersistentFbTexture();
+
 private:
   rstl::optional_object< TCachedToken< CTexture > > x0_paletteTex;
   EBlurType x10_curType;
@@ -42,8 +49,8 @@ class CCameraBlurPass {
   float x24_totalTime;
   float x28_remainingTime;
   bool x2c_usePersistent;
-  bool x2d_noPersistentCopy;
-  uint x30_persistentBuf;
+  mutable bool x2d_noPersistentCopy;
+  void* x30_persistentBuf;
 };
 CHECK_SIZEOF(CCameraBlurPass, 0x34)
 

include/MetroidPrime/Cameras/CCameraFilterPass.hpp

@@ -46,13 +46,19 @@ class CCameraFilterPass {
   void Update(float dt);
   void Draw() const;
 
+  float GetT(bool invert) const;
+
   static void DrawWideScreen(const CColor& color, const CTexture* tex, float v);
   static void DrawFilter(EFilterType type, EFilterShape shape, const CColor& color,
                          const CTexture* tex, float lod);
+  static void DrawFilterShape(EFilterShape shape, const CColor& color, const CTexture* tex,
+                              float lod);
   static void DrawFullScreenColoredQuad(const CColor& color);
   static void DrawFullScreenTexturedQuad(const CColor& color, const CTexture* tex, float lod);
   static void DrawFullScreenTexturedQuadQuarters(const CColor& color, const CTexture* tex,
                                                  float lod);
+  static void DrawScanLines(const CColor& color, bool even);
+  static void DrawRandomStatic(const CColor& color, float alpha, bool cookieCutter);
 
 private:
   EFilterType x0_curType;