Work on load/save menu

Author: yaz0r

AzelLib/3dEngine.h

@@ -59,8 +59,7 @@ struct sFieldCameraStatus
 extern sMatrix4x3* pCurrentMatrix;
 
 void addObjectToDrawList(struct sProcessed3dModel* pObjectData);
-void addBillBoardToDrawList(u8* pObjectData, u32 offset);
-void addBillBoardToDrawList(sProcessed3dModel* pObjectData);
+void addBillBoardToDrawList(struct sProcessed3dModel* pObjectData);
 
 void updateEngineCamera(s_cameraProperties2* r4, const sVec3_FP& r5_position, const sVec3_S16& r6_rotation);
 

AzelLib/3dEngine_flush.cpp

@@ -141,27 +141,6 @@ void addBillBoardToDrawList(sProcessed3dModel* pObjectData)
     objectRenderList.push_back(newObject);
 }
 
-void addBillBoardToDrawList(u8* pObjectData, u32 offset)
-{
-    sKey thisKey;
-    thisKey.pObjectData = pObjectData;
-    thisKey.offset = offset;
-
-    sProcessed3dModel* pModel = NULL;
-    auto search = modelMap.find(thisKey);
-    if (search != modelMap.end())
-    {
-        pModel = search->second;
-    }
-    else
-    {
-        pModel = new sProcessed3dModel(pObjectData, offset);
-        modelMap[thisKey] = pModel;
-    }
-
-    addBillBoardToDrawList(pModel);
-}
-
 void checkGLImpl(const char* file, unsigned int line)
 {
     GLenum error = glGetError();

AzelLib/PDS.cpp

@@ -559,6 +559,11 @@ void patchFilePointers(s_fileBundle* destination, u32 characterArea)
     destination->setPatchFilePointers(characterArea);
 }
 
+int loadFile2(const char* fileName, u8* destination, u16 vdp1Pointer)
+{
+    return loadFile(fileName, destination, vdp1Pointer);
+}
+
 // version used for raw data (non-bundle)
 int loadFile(const char* fileName, u8* destination, u16 vdp1Pointer)
 {
@@ -1104,3 +1109,4 @@ void adjustMatrixTranslation(fixedPoint r4)
     pCurrentMatrix->matrix[7] += (((s64)pCurrentMatrix->matrix[5] * (s64)r4) >> 16);
     pCurrentMatrix->matrix[11] += (((s64)pCurrentMatrix->matrix[9] * (s64)r4) >> 16);
 }
+

AzelLib/PDS.h

@@ -192,6 +192,8 @@ struct sSaturnPtr
         temp.m_file = pFile;
         return temp;
     }
+
+    u8* getRawPointer();
 };
 
 struct sSaturnMemoryFile

AzelLib/VDP2.cpp

@@ -452,7 +452,7 @@ sLayerConfig textLayerVdp2Setup[] = {
     m0_END
 };
 
-void setupNBG0(sLayerConfig* setup)
+void setupNBG0(const sLayerConfig* setup)
 {
     while (eVdp2LayerConfig command = setup->m_configType)
     {
@@ -495,7 +495,7 @@ void setupNBG0(sLayerConfig* setup)
     vdp2Controls.m_isDirty = true;
 }
 
-void setupNBG1(sLayerConfig* setup)
+void setupNBG1(const sLayerConfig* setup)
 {
     while (eVdp2LayerConfig command = setup->m_configType)
     {
@@ -556,7 +556,7 @@ void setupNBG1(sLayerConfig* setup)
     vdp2Controls.m_isDirty = true;
 }
 
-void setupNBG2(sLayerConfig* setup)
+void setupNBG2(const sLayerConfig* setup)
 {
     while (eVdp2LayerConfig command = setup->m_configType)
     {
@@ -608,7 +608,7 @@ void setupNBG2(sLayerConfig* setup)
     vdp2Controls.m_isDirty = true;
 }
 
-void setupNBG3(sLayerConfig* setup)
+void setupNBG3(const sLayerConfig* setup)
 {
     while (eVdp2LayerConfig command = setup->m_configType)
     {

AzelLib/VDP2.h

@@ -107,7 +107,11 @@ struct s_VDP2Regs
     u16 mF6_PRISD;
     u16 mF8_PRINA;
     u16 mFA_PRINB;
-    u16 mFC_PRIR;
+    u16 mFC_PRIR;
+    u16 m100_CCRSA;
+    u16 m102_CCRSB;
+    u16 m104_CCRSC;
+    u16 m106_CCRSD;
     u16 m10A_CCRNB;
     u16 m110_CLOFEN;
     u16 m112_CLOFSL;
@@ -170,10 +174,10 @@ void setupVDP2CoordinatesIncrement2(u32, u32);
 void initVDP2();
 void reinitVdp2();
 
-void setupNBG0(sLayerConfig* setup);
-void setupNBG1(sLayerConfig* setup);
-void setupNBG2(sLayerConfig* setup);
-void setupNBG3(sLayerConfig* setup);
+void setupNBG0(const sLayerConfig* setup);
+void setupNBG1(const sLayerConfig* setup);
+void setupNBG2(const sLayerConfig* setup);
+void setupNBG3(const sLayerConfig* setup);
 
 void setupVDP2StringRendering(s32 x, s32 y, s32 width, s32 height);
 void vdp2DebugPrintSetPosition(s32 x, s32 y);
@@ -249,6 +253,7 @@ void setVdp2VramU32(u32 offset, u32 value);
 u8* getVdp2Cram(u32 offset);
 
 int loadFile(const char* fileName, u8* destination, u16 vdp1Pointer);
+int loadFile2(const char* fileName, u8* destination, u16 vdp1Pointer);
 int loadFile(const char* fileName, s_fileBundle** destination, u16 vdp1Pointer);
 void addToMemoryLayout(u8* pointer, u32 unk0);
 void asyncDmaCopy(void* source, void* target, u32 size, u32 unk);

AzelLib/common.cpp

@@ -807,3 +807,12 @@ sVec3_FP readSaturnVec3(sSaturnPtr ptr)
 
     return newVec;
 }
+
+u8* sSaturnPtr::getRawPointer()
+{
+    sSaturnMemoryFile* pFile = m_file;
+    u32 offsetInFile = m_offset - m_file->m_base;
+    assert(offsetInFile <= pFile->m_dataSize);
+
+    return pFile->m_data + offsetInFile;
+}

AzelLib/field.cpp

@@ -77,14 +77,15 @@ void setupFileList(const s_MCB_CGB* fileList)
     fieldTaskPtr->m8_pSubFieldData->m30_fileList = fileList;
 
     checkFilesExists(fileList);
-
-    fieldTaskPtr->m8_pSubFieldData->m0_memoryArea[0] = fieldTaskPtr->m8_pSubFieldData->m20_memoryArea_bottom;
-    fieldTaskPtr->m8_pSubFieldData->m0_memoryArea[1] = fieldTaskPtr->m8_pSubFieldData->m0_memoryArea[0] + fieldTaskPtr->m8_pSubFieldData->m34_MCBFilesSizes[0]; // TODO: should be aligned
-    fieldTaskPtr->m8_pSubFieldData->m0_memoryArea[2] = fieldTaskPtr->m8_pSubFieldData->m0_memoryArea[1] + fieldTaskPtr->m8_pSubFieldData->m34_MCBFilesSizes[1]; // TODO: should be aligned
 
-    fieldTaskPtr->m8_pSubFieldData->m0_bundles[0] = new s_fileBundle(fieldTaskPtr->m8_pSubFieldData->m0_memoryArea[0]);
-    fieldTaskPtr->m8_pSubFieldData->m0_bundles[1] = new s_fileBundle(fieldTaskPtr->m8_pSubFieldData->m0_memoryArea[1]);
-    fieldTaskPtr->m8_pSubFieldData->m0_bundles[2] = new s_fileBundle(fieldTaskPtr->m8_pSubFieldData->m0_memoryArea[2]);
+    u8* buffers[3];
+    buffers[0] = fieldTaskPtr->m8_pSubFieldData->m20_memoryArea_bottom;
+    buffers[1] = buffers[0] + fieldTaskPtr->m8_pSubFieldData->m34_MCBFilesSizes[0]; // TODO: should be aligned
+    buffers[2] = buffers[1] + fieldTaskPtr->m8_pSubFieldData->m34_MCBFilesSizes[1]; // TODO: should be aligned
+
+    fieldTaskPtr->m8_pSubFieldData->m0_bundles[0] = new s_fileBundle(buffers[0]);
+    fieldTaskPtr->m8_pSubFieldData->m0_bundles[1] = new s_fileBundle(buffers[1]);
+    fieldTaskPtr->m8_pSubFieldData->m0_bundles[2] = new s_fileBundle(buffers[2]);
 
     fieldTaskPtr->m8_pSubFieldData->mC_characterArea[0] = fieldTaskPtr->m8_pSubFieldData->m28_characterArea_bottom;
     fieldTaskPtr->m8_pSubFieldData->mC_characterArea[1] = fieldTaskPtr->m8_pSubFieldData->mC_characterArea[0] + fieldTaskPtr->m8_pSubFieldData->m1B4_CGBFilesSizes[0]; // TODO: should be aligned
@@ -105,7 +106,7 @@ void setupFileList(const s_MCB_CGB* fileList)
         currentFileIndex++;
     }
 
-    fieldTaskPtr->m8_pSubFieldData->m18_memoryArea_edge = fieldTaskPtr->m8_pSubFieldData->m0_memoryArea[2] + largestMCB; // TODO: should be aligned
+    fieldTaskPtr->m8_pSubFieldData->m18_memoryArea_edge = buffers[2] + largestMCB; // TODO: should be aligned
     fieldTaskPtr->m8_pSubFieldData->m1C_characterArea_edge = fieldTaskPtr->m8_pSubFieldData->mC_characterArea[2] + largestCGB; // TODO: should be aligned
 }
 
@@ -128,7 +129,6 @@ void loadFileFromFileList(u32 index)
     if (pFileData->MCB)
     {
         loadFile(pFileData->MCB, &fieldTaskPtr->m8_pSubFieldData->m0_bundles[slot], fieldTaskPtr->m8_pSubFieldData->mC_characterArea[slot] >> 3);
-        fieldTaskPtr->m8_pSubFieldData->m0_memoryArea[slot] = fieldTaskPtr->m8_pSubFieldData->m0_bundles[slot]->getRawBuffer();
     }
 
     if (pFileData->CGB)
@@ -144,7 +144,6 @@ void getMemoryArea(s_memoryAreaOutput* pOutput, u32 areaIndex)
         areaIndex = 2;
     }
 
-    pOutput->m0_mainMemory = fieldTaskPtr->m8_pSubFieldData->m0_memoryArea[areaIndex];
     pOutput->m0_mainMemoryBundle = fieldTaskPtr->m8_pSubFieldData->m0_bundles[areaIndex];
     pOutput->m4_characterArea = fieldTaskPtr->m8_pSubFieldData->mC_characterArea[areaIndex];
 }

AzelLib/field.h

@@ -298,7 +298,6 @@ struct s_fieldScriptWorkArea : public s_workAreaTemplate<s_fieldScriptWorkArea>
 
 struct s_memoryAreaOutput
 {
-    u8* m0_mainMemory;
     struct s_fileBundle* m0_mainMemoryBundle;
     u32 m4_characterArea;
 };
@@ -737,7 +736,6 @@ struct s_FieldSubTaskWorkArea : public s_workAreaTemplate<s_FieldSubTaskWorkArea
     static void Draw(s_FieldSubTaskWorkArea*);
     static void Delete(s_FieldSubTaskWorkArea*);
 
-    std::array<u8*, 3> m0_memoryArea; // 0
     std::array<struct s_fileBundle*, 3> m0_bundles;
     std::array<u32, 3> mC_characterArea; // C
     u8* m18_memoryArea_edge; // 18

AzelLib/field/field_a3/o_fld_a3.cpp

@@ -206,10 +206,7 @@ void s_visdibilityCellTask::gridCellDraw_normal(s_visdibilityCellTask* pTypedWor
         while (r14->m0_offsetTable.m_offset)
         {
             r13->m12E0++;
-
-            s16 r2 = readSaturnS16(r14->m0_offsetTable);
-            u32 r1 = READ_BE_U32(pTypedWorkAread->m0_memoryLayout.m0_mainMemory + r2);
-            r13->m12F0 += READ_BE_U32(pTypedWorkAread->m0_memoryLayout.m0_mainMemory + r1 + 4);
+            r13->m12F0 += pTypedWorkAread->m0_memoryLayout.m0_mainMemoryBundle->get3DModel(readSaturnS16(r14->m0_offsetTable))->m4_numVertices;
 
             if (!r13->m12FC_isObjectClipped(&r14->m4, r15))
             {
@@ -264,10 +261,7 @@ void s_visdibilityCellTask::gridCellDraw_normal(s_visdibilityCellTask* pTypedWor
         while (r14 != pTypedWorkAread->mC_pCell2_billboards->end())
         {
             r13->m12E0++;
-
-            s16 r2 = readSaturnS16(r14->m0);
-            u32 r1 = READ_BE_U32(pTypedWorkAread->m0_memoryLayout.m0_mainMemory + r2);
-            r13->m12F0 += READ_BE_U32(pTypedWorkAread->m0_memoryLayout.m0_mainMemory + r1 + 4);
+            r13->m12F0 += pTypedWorkAread->m0_memoryLayout.m0_mainMemoryBundle->get3DModel(readSaturnS16(r14->m0))->m4_numVertices;
 
             if (!r13->m12FC_isObjectClipped(&r14->m4, r15))
             {