Add support for HD cams.

Source/AliveLibAE/Renderer/DirectX9Renderer.cpp

@@ -20,6 +20,8 @@ void DirectX9Renderer::Destroy()
 
 bool DirectX9Renderer::Create(TWindowHandleType window)
 {
+    rendererType = Renderers::DirectX9;
+
     // Find the directx9 driver
     const s32 numDrivers = SDL_GetNumRenderDrivers();
     if (numDrivers < 0)
@@ -180,4 +182,9 @@ void DirectX9Renderer::Upload(BitDepth /*bitDepth*/, const PSX_RECT& /*rect*/, c
 {
 }
 
+void DirectX9Renderer::LoadExternalCam(const char* /*path*/, const unsigned char* /*key*/, int /*keyLength*/)
+{
+    LOG_WARNING("LoadExternalCam not implemented for DirectX9 - external cam not loaded.");
+}
+
 #endif

Source/AliveLibAE/Renderer/DirectX9Renderer.hpp

@@ -36,6 +36,8 @@ class DirectX9Renderer final : public IRenderer
 
     void Upload(BitDepth bitDepth, const PSX_RECT& rect, const u8* pPixels) override;
 
+    void LoadExternalCam(const char* path, const unsigned char* key, int keyLength) override;
+
 private:
     SDL_Renderer* mRenderer = nullptr;
     IDirect3DDevice9* mDevice = nullptr;

Source/AliveLibAE/Renderer/IRenderer.cpp

@@ -4,7 +4,7 @@
 #include "OpenGLRenderer.hpp"
 #include "DirectX9Renderer.hpp"
 
-static IRenderer* gRenderer = nullptr;
+IRenderer* gRenderer = nullptr;
 
 IRenderer* IRenderer::GetRenderer()
 {

Source/AliveLibAE/Renderer/IRenderer.hpp

@@ -12,6 +12,7 @@ class IRenderer
 public:
     enum class Renderers
     {
+        None = 0,
         Software,
         DirectX9,
         OpenGL,
@@ -36,6 +37,8 @@ class IRenderer
     };
 
 public:
+    Renderers rendererType = Renderers::None;
+
     virtual ~IRenderer()
     { }
     virtual void Destroy() = 0;
@@ -59,6 +62,8 @@ class IRenderer
 
     virtual void Upload(BitDepth bitDepth, const PSX_RECT& rect, const u8* pPixels) = 0;
 
+    virtual void LoadExternalCam(const char* path, const unsigned char* key, int keyLength) = 0;
+
     // FG1/zaplines/blood/hintfly
     virtual void Draw(Prim_Sprt& sprt) = 0;
     virtual void Draw(Prim_GasEffect& gasEffect) = 0;
@@ -89,4 +94,6 @@ class IRenderer
 
     // Fleech (tounge), DeathGas, ColourfulMeter
     virtual void Draw(Poly_G4& poly) = 0;
-};
+};
+
+extern IRenderer* gRenderer;

Source/AliveLibAE/Renderer/OpenGLRenderer.cpp

@@ -727,6 +727,8 @@ void OpenGLRenderer::Destroy()
 
 bool OpenGLRenderer::Create(TWindowHandleType window)
 {
+    rendererType = Renderers::OpenGL;
+
     mWindow = window;
     mWireframe = false;
 
@@ -1544,42 +1546,39 @@ void OpenGLRenderer::Upload(BitDepth bitDepth, const PSX_RECT& rect, const u8* p
     }
 }
 
-void HackSetBackground(const char_type* path)
+void OpenGLRenderer::LoadExternalCam(const char* path, const unsigned char* key, int keyLength)
 {
-    //return;
-
-    const char_type* camSearchs[] = {
-        "hd/%s.PNG",
-        "hd/%s.CAM.PNG",
-        "hd/%s.CAM.cam.PNG"};
+    std::vector<BYTE> fileData;
 
-    FILE* fh = NULL;
+    // Try to keep all paths and filenames lowercase for our linux friends.
+    std::ifstream file("hd/" + std::string(path).substr(0, 8) + ".cam2", std::ios::binary);
 
-    for (s32 i = 0; i < 3; i++)
+    if (file.is_open())
     {
-        char_type newPath[100];
-        char_type camHack[9] = {};
-        memcpy(camHack, path, 8);
-        sprintf(newPath, camSearchs[i], camHack);
-        fh = fopen(newPath, "rb");
-
-        if (fh != NULL)
-        {
-            break;
-        }
+        fileData = std::vector<BYTE>((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
+        file.close();
     }
 
-    if (fh == NULL)
+    if (fileData.size() == 0)
     {
-        /*glDeleteTextures(1, &mBackgroundTexture);
-        mBackgroundTexture = 0;*/
+        glDeleteTextures(1, &mBackgroundTexture);
+        mBackgroundTexture = 0;
         return;
     }
 
-    s32 x = 0, y = 0;
-    s32 comp = 0;
-    const u8* data = stbi_load_from_file(fh, &x, &y, &comp, 4);
+    BYTE* fPtr = fileData.data();
+
+    // XOR the custom cam file with the data from the original game.
+    // You wouldn't steal an Abe? https://www.youtube.com/watch?v=HmZm8vNHBSU
+    for (unsigned int i = 0; i < fileData.size(); i++)
+    {
+        fPtr[i] ^= key[i % keyLength];
+    }
+
+    int x = 0, y = 0, comp = 0;
+    const unsigned char* data = stbi_load_from_memory(fileData.data(), static_cast<int>(fileData.size()), &x, &y, &comp, 4);
 
+    // Check if we've created a texture handle already, if not, do so.
     if (mBackgroundTexture == 0)
     {
         glGenTextures(1, &mBackgroundTexture);
@@ -1594,7 +1593,5 @@ void HackSetBackground(const char_type* path)
 
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, x, y, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
 
-    stbi_image_free((void*) data);
-
-    fclose(fh);
-}
+    stbi_image_free((void*)data);
+}

Source/AliveLibAE/Renderer/OpenGLRenderer.hpp

@@ -82,6 +82,8 @@ class OpenGLRenderer final : public IRenderer
 
     void Upload(BitDepth bitDepth, const PSX_RECT& rect, const u8* pPixels) override;
 
+    void LoadExternalCam(const char* path, const unsigned char* key, int keyLength) override;
+
 private:
     SDL_Window* mWindow = nullptr;
     SDL_GLContext mContext = nullptr;
@@ -110,6 +112,4 @@ class OpenGLRenderer final : public IRenderer
     void DrawLines(const VertexData* pVertData, s32 vertSize, const GLuint* pIndData, s32 indSize);
 
     void RenderBackground();
-};
-
-void HackSetBackground(const char_type* path);
+};

Source/AliveLibAE/Renderer/SoftwareRenderer.cpp

@@ -11,6 +11,7 @@ void SoftwareRenderer::Destroy()
 
 bool SoftwareRenderer::Create(TWindowHandleType window)
 {
+    rendererType = Renderers::Software;
     mRenderer = SDL_CreateRenderer(window, -1, 0);
     return mRenderer != nullptr;
 }
@@ -231,3 +232,8 @@ void SoftwareRenderer::Upload(BitDepth bitDepth, const PSX_RECT& rect, const u8*
             break;
     }
 }
+
+void SoftwareRenderer::LoadExternalCam(const char* /*path*/, const unsigned char* /*key*/, int /*keyLength*/)
+{
+    LOG_WARNING("LoadExternalCam not implemented for Software Renderer - external cam not loaded.");
+}

Source/AliveLibAE/Renderer/SoftwareRenderer.hpp

@@ -34,6 +34,8 @@ class SoftwareRenderer : public IRenderer
 
     void Upload(BitDepth bitDepth, const PSX_RECT& rect, const u8* pPixels) override;
 
+    void LoadExternalCam(const char* path, const unsigned char* key, int keyLength) override;
+
 private:
     bool mFrameStarted = false;
 

Source/AliveLibAE/ScreenManager.cpp

@@ -9,6 +9,10 @@
 #include "VRam.hpp"
 #include "Psx.hpp"
 #include "Renderer/IRenderer.hpp"
+#include "Map.hpp"
+#include "PathData.hpp"
+#include "Renderer/IRenderer.hpp"
+#include "Renderer/OpenGLRenderer.hpp"
 
 ALIVE_VAR(1, 0x5BB5F4, ScreenManager*, pScreenManager_5BB5F4, nullptr);
 ALIVE_ARY(1, 0x5b86c8, SprtTPage, 300, sSpriteTPageBuffer_5B86C8, {});
@@ -463,6 +467,15 @@ void ScreenManager::DecompressCameraToVRam_40EF60(u16** ppBits)
     UnsetDirtyBits_40EDE0(1);
     UnsetDirtyBits_40EDE0(2);
     UnsetDirtyBits_40EDE0(3);
+
+    char camName[32] = {};
+    Path_Format_CameraName_460FB0(
+        camName,
+        gMap_5C3030.field_0_current_level,
+        gMap_5C3030.field_2_current_path,
+        gMap_5C3030.field_4_current_camera);
+
+    gRenderer->LoadExternalCam(camName, reinterpret_cast<const unsigned char*>(*ppBits), 512);
 }
 
 ScreenManager* ScreenManager::ctor_40E3E0(u8** ppBits, FP_Point* pCameraOffset)