Merge ovl upload

TIM/png2tim8.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# convert to 256 colors
-#~ for i in bg_*.png; do convert $i -colors 256 $i; done
-
-# convert to tim
-for i in bg_*.png; do img2tim -t -bpp 8 -org 320 0 -plt 0 481 -o ${i%.*}.tim $i;done
-
-
-# Other PNGs
-
-
-img2tim -org 576 256 -plt 0 480 -bpp 8-o cat.tim cat.png
-
-img2tim -usealpha -org 576 0 -plt 0 481 -bpp 8 -o home.tim home.png
-
-img2tim -org 320 256 -plt 0 482 -bpp 8 -o lara.tim lara.png

isotest.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+make && mkpsxiso -y config/OverlayExample.xml && prime-run pcsx-redux -run -iso OverlayExample.cue

levels/level0.h

@@ -136,6 +136,30 @@ extern TMESH level0_modelgnd_002;
 
 extern MESH level0_meshgnd_002;
 
+extern SVECTOR modelLara_mesh[];
+
+extern SVECTOR level0_modelLara_normal[];
+
+extern SVECTOR level0_modelLara_uv[];
+
+extern CVECTOR level0_modelLara_color[];
+
+extern PRIM level0_modelLara_index[];
+
+extern BODY  level0_modelLara_body;
+
+extern TMESH level0_modelLara;
+
+extern unsigned long _binary_TIM_lara_tim_start[];
+
+extern unsigned long _binary_TIM_lara_tim_end[];
+
+extern unsigned long _binary_TIM_lara_tim_length;
+
+extern TIM_IMAGE level0_tim_lara;
+
+extern MESH level0_meshLara;
+
 extern SVECTOR modelobject_mesh[];
 
 extern SVECTOR level0_modelobject_normal[];
@@ -264,13 +288,71 @@ extern TMESH level0_modelwall_003;
 
 extern MESH level0_meshwall_003;
 
-extern MESH * level0_meshes[14];
+extern MESH * level0_meshes[15];
 
 extern int level0_meshes_length;
 
+extern unsigned long _binary_TIM_bg_camPath_tim_start[];
+
+extern unsigned long _binary_TIM_bg_camPath_tim_end[];
+
+extern unsigned long _binary_TIM_bg_camPath_tim_length;
+
+extern TIM_IMAGE tim_bg_camPath;
+
+extern CAMANGLE level0_camAngle_camPath;
+
+extern unsigned long _binary_TIM_bg_camPath_001_tim_start[];
+
+extern unsigned long _binary_TIM_bg_camPath_001_tim_end[];
+
+extern unsigned long _binary_TIM_bg_camPath_001_tim_length;
+
+extern TIM_IMAGE tim_bg_camPath_001;
+
 extern CAMANGLE level0_camAngle_camPath_001;
 
-extern CAMANGLE * level0_camAngles[0];
+extern unsigned long _binary_TIM_bg_camPath_002_tim_start[];
+
+extern unsigned long _binary_TIM_bg_camPath_002_tim_end[];
+
+extern unsigned long _binary_TIM_bg_camPath_002_tim_length;
+
+extern TIM_IMAGE tim_bg_camPath_002;
+
+extern CAMANGLE level0_camAngle_camPath_002;
+
+extern unsigned long _binary_TIM_bg_camPath_003_tim_start[];
+
+extern unsigned long _binary_TIM_bg_camPath_003_tim_end[];
+
+extern unsigned long _binary_TIM_bg_camPath_003_tim_length;
+
+extern TIM_IMAGE tim_bg_camPath_003;
+
+extern CAMANGLE level0_camAngle_camPath_003;
+
+extern unsigned long _binary_TIM_bg_camPath_004_tim_start[];
+
+extern unsigned long _binary_TIM_bg_camPath_004_tim_end[];
+
+extern unsigned long _binary_TIM_bg_camPath_004_tim_length;
+
+extern TIM_IMAGE tim_bg_camPath_004;
+
+extern CAMANGLE level0_camAngle_camPath_004;
+
+extern unsigned long _binary_TIM_bg_camPath_005_tim_start[];
+
+extern unsigned long _binary_TIM_bg_camPath_005_tim_end[];
+
+extern unsigned long _binary_TIM_bg_camPath_005_tim_length;
+
+extern TIM_IMAGE tim_bg_camPath_005;
+
+extern CAMANGLE level0_camAngle_camPath_005;
+
+extern CAMANGLE * level0_camAngles[6];
 
 extern SIBLINGS level0_nodegnd_siblings;
 

levels/level1.c

@@ -10978,14 +10978,14 @@ NODE * level1_curNode =  &level1_nodegnd_002;
 LEVEL level1 = {
 	&level1_cmat,
 	&level1_lgtmat,
-	&level1_meshes,
+	(MESH**)&level1_meshes,
 	&level1_meshes_length,
 	&level1_meshSphere,
 	&level1_meshgnd_002,
 	&level1_meshSphere_001,
 	&level1_camAngle_camPath_001,
 	&level1_camPath,
-	&level1_camAngles,
+	(CAMANGLE **)&level1_camAngles,
 	&level1_nodegnd_002,
 	&level1_meshPlan
 };

main.c

@@ -31,7 +31,7 @@
 #include "space.h"
 //~ #include "pcdrv.h"
 
-//~ #define USECD
+#define USECD
 
 // START OVERLAY
 
@@ -75,8 +75,6 @@ u_long overlaySize = 0;
 
 #include "levels/level1.h"
 
-// Level
-
 volatile u_char level = 1;
 
 // level 1 : 8003F05C -2147225508
@@ -144,7 +142,7 @@ u_short timer = 0;
 
 // Cam stuff 
 
-int camMode = 0;
+int camMode = 2;
 
 VECTOR angle     = {250,0,0,0};
 
@@ -594,7 +592,6 @@ int main() {
         // Fixed Camera angle
         if (camMode == 2) {                              
           
-          
             // If BG images exist
             
             if (curLvl.camPtr->tim_data){

pcdrv.c

@@ -48,7 +48,7 @@ void PCload( u_long * loadAddress, u_short * flagAddress, const char * filename
   //~ printf("open:%s:%i:%08x", filename, attributes, &fd);
   
   //~ waitForSIODone(0);
-  
+
   //~ return fd; // If all is well, returns a positive int . If -1, wrong
 
 //~ };

pcsx.json

@@ -16,13 +16,33 @@
     "Bios": "/home/arthus/build/pcsx-redux/src/mips/openbios/openbios.bin",
     "BnWMdec": false,
     "CDDA": 1,
-    "Debug": true,
+    "Debug": {
+      "Debug": false,
+      "FirstChanceException": 7408,
+      "GdbManifest": true,
+      "GdbServer": false,
+      "GdbServerPort": 3333,
+      "GdbServerTrace": false,
+      "KernelCallA0_00_1f": 4294967295,
+      "KernelCallA0_20_3f": 4294967295,
+      "KernelCallA0_40_5f": 4294967295,
+      "KernelCallA0_60_7f": 4294967295,
+      "KernelCallA0_80_9f": 4294967295,
+      "KernelCallA0_a0_bf": 4294967295,
+      "KernelCallB0_00_1f": 4294967295,
+      "KernelCallB0_20_3f": 4294967295,
+      "KernelCallB0_40_5f": 4294967295,
+      "KernelCallC0_00_1f": 4294967295,
+      "KernelLog": false,
+      "LoggingCDROM": false,
+      "SkipISR": false,
+      "Trace": false,
+      "WebServer": false,
+      "WebServerPort": 8080
+    },
     "Dynarec": false,
-    "FastBoot": false,
+    "FastBoot": true,
-    "GdbServer": true,
+    "IsoPath": "/home/arthus/build/pcsx-redux/src/mips/3dcam-bak",
-    "GdbServerPort": 3333,
-    "GdbServerTrace": false,
-    "IsoPath": "/home/arthus/Jeux/emul/psx/Vagrant Story (USA)",
     "Locale": "",
     "Logfile": "",
     "Mcd1": "memcard1.mcd",
@@ -31,27 +51,86 @@
     "Mcd2Inserted": true,
     "Overlay": [],
     "PpfDir": "",
-    "PsxExe": "SLUS_010.40;1",
+    "PsxExe": "SCES_003.90;1",
     "RCntFix": false,
-    "SioIrq": false,
     "SpuIrq": false,
     "Stdout": false,
-    "Verbose": false,
+    "Video": 1,
-    "Video": 0,
-    "WebServer": false,
-    "WebServerPort": 8080,
     "Xa": true
   },
   "gui": {
     "Fullscreen": false,
     "FullscreenRender": true,
-    "IdleSwapInterval": 1,
+    "IdleSwapInterval": 0,
+    "MainFontSize": 16,
+    "MonoFontSize": 16,
     "ShowLog": true,
+    "ShowLuaConsole": false,
+    "ShowLuaEditor": false,
+    "ShowLuaInspector": false,
     "ShowMenu": true,
     "WindowPosX": 1,
     "WindowPosY": 26,
-    "WindowSizeX": 719,
+    "WindowSizeX": 898,
-    "WindowSizeY": 542
+    "WindowSizeY": 683
   },
-  "imgui": "[Window][Debug##Default]\nPos=60,60\nSize=400,400\nCollapsed=0\n\n[Window][Emulation Configuration]\nViewportPos=882,165\nViewportId=0xA515CB4B\nSize=316,619\nCollapsed=0\n\n[Window][Logs]\nViewportPos=-158,629\nViewportId=0x50BD6962\nSize=720,450\nCollapsed=0\n\n[Window][Soft GPU configuration]\nPos=288,182\nSize=300,200\nCollapsed=0\n\n[Window][Main VRAM Viewer]\nViewportPos=1157,-262\nViewportId=0xD2F1ACB4\nSize=1321,900\nCollapsed=0\n\n[Window][Registers]\nViewportPos=1244,-4\nViewportId=0xA4D966FE\nSize=493,512\nCollapsed=0\nDockId=0x00000002,0\n\n[Window][Breakpoints]\nViewportPos=1244,-4\nViewportId=0xA4D966FE\nSize=639,660\nCollapsed=0\nDockId=0x00000003,0\n\n[Window][Assembly]\nViewportPos=1077,89\nViewportId=0xE37F8D5D\nSize=623,751\nCollapsed=0\n\n[Window][Output]\nPos=160,48\nSize=810,532\nCollapsed=0\n\n[Window][About]\nPos=199,66\nSize=880,600\nCollapsed=0\n\n[Window][Dear ImGui Demo]\nPos=669,25\nSize=550,680\nCollapsed=0\n\n[Window][SPU configuration]\nPos=69,56\nSize=550,220\nCollapsed=0\n\n[Window][SPU Debug]\nViewportPos=962,725\nViewportId=0xE5F7C643\nSize=1200,430\nCollapsed=0\n\n[Window][Memory Editor #1]\nViewportPos=1139,76\nViewportId=0xE9869392\nSize=584,539\nCollapsed=0\n\n[Window][Source]\nViewportPos=61,86\nViewportId=0x58267A45\nSize=416,536\nCollapsed=0\n\n[Window][Callstack]\nViewportPos=48,90\nViewportId=0xA9FDEE8E\nSize=426,525\nCollapsed=0\n\n[Window][Dwarf]\nPos=60,60\nSize=404,388\nCollapsed=0\n\n[Window][Symbols]\nPos=60,60\nSize=147,62\nCollapsed=0\n\n[Window][Scratch Pad]\nViewportPos=719,-7\nViewportId=0xB7AD35A5\nSize=484,480\nCollapsed=0\n\n[Window][Hardware Registers]\nViewportPos=847,221\nViewportId=0x311B7332\nSize=584,612\nCollapsed=0\n\n[Window][CLUT VRAM selector]\nViewportPos=737,320\nViewportId=0xF0235A86\nPos=0,5\nSize=330,252\nCollapsed=0\n\n[Docking][Data]\nDockNode    ID=0x00000001 Pos=1244,-4 Size=639,660 Split=X\n  DockNode  ID=0x00000002 Parent=0x00000001 SizeRef=105,512 Selected=0x837A6095\n  DockNode  ID=0x00000003 Parent=0x00000001 SizeRef=103,512 Selected=0x0263173C\n\n"
+  "imgui": "[Window][Debug##Default]\nPos=60,60\nSize=400,400\nCollapsed=0\n\n[Window][Emulation Configuration]\nViewportPos=183,218\nViewportId=0xA515CB4B\nSize=518,555\nCollapsed=0\n\n[Window][Logs]\nViewportPos=0,709\nViewportId=0x50BD6962\nSize=900,709\nCollapsed=0\n\n[Window][Soft GPU configuration]\nPos=288,182\nSize=300,200\nCollapsed=0\n\n[Window][Main VRAM Viewer]\nViewportPos=1543,430\nViewportId=0xD2F1ACB4\nSize=1321,900\nCollapsed=0\n\n[Window][Registers]\nViewportPos=969,588\nViewportId=0xA4D966FE\nSize=639,660\nCollapsed=0\nDockId=0x00000002,0\n\n[Window][Breakpoints]\nViewportPos=1244,-4\nViewportId=0xA4D966FE\nSize=639,660\nCollapsed=0\nDockId=0x00000003,0\n\n[Window][Assembly]\nViewportPos=1077,89\nViewportId=0xE37F8D5D\nSize=623,751\nCollapsed=0\n\n[Window][Output]\nPos=160,48\nSize=810,532\nCollapsed=0\n\n[Window][About]\nPos=199,66\nSize=880,600\nCollapsed=0\n\n[Window][Dear ImGui Demo]\nPos=669,25\nSize=550,680\nCollapsed=0\n\n[Window][SPU configuration]\nPos=69,56\nSize=550,220\nCollapsed=0\n\n[Window][SPU Debug]\nViewportPos=962,725\nViewportId=0xE5F7C643\nSize=1200,430\nCollapsed=0\n\n[Window][Memory Editor #1]\nViewportPos=295,84\nViewportId=0xE9869392\nSize=584,539\nCollapsed=0\n\n[Window][Source]\nViewportPos=61,86\nViewportId=0x58267A45\nSize=416,536\nCollapsed=0\n\n[Window][Callstack]\nViewportPos=48,90\nViewportId=0xA9FDEE8E\nSize=426,525\nCollapsed=0\n\n[Window][Dwarf]\nPos=60,60\nSize=404,388\nCollapsed=0\n\n[Window][Symbols]\nPos=60,60\nSize=147,62\nCollapsed=0\n\n[Window][Scratch Pad]\nViewportPos=719,-7\nViewportId=0xB7AD35A5\nSize=484,480\nCollapsed=0\n\n[Window][Hardware Registers]\nViewportPos=847,221\nViewportId=0x311B7332\nSize=584,612\nCollapsed=0\n\n[Window][CLUT VRAM selector]\nViewportPos=737,320\nViewportId=0xF0235A86\nPos=0,5\nSize=330,252\nCollapsed=0\n\n[Window][Memory Editor #3]\nViewportPos=520,50\nViewportId=0x0788F2BE\nSize=484,480\nCollapsed=0\n\n[Window][Notification]\nPos=174,280\nSize=549,123\nCollapsed=0\n\n[Window][Select BIOS]\nPos=73,92\nSize=774,459\nCollapsed=0\n\n[Docking][Data]\nDockNode    ID=0x00000001 Pos=969,588 Size=639,660 Split=X\n  DockNode  ID=0x00000002 Parent=0x00000001 SizeRef=105,512 Selected=0x837A6095\n  DockNode  ID=0x00000003 Parent=0x00000001 SizeRef=103,512 Selected=0x0263173C\n\n",
+  "loggers": {
+    "CDROM": {
+      "displayed": true,
+      "enabled": true
+    },
+    "CDROM_IO": {
+      "displayed": true,
+      "enabled": true
+    },
+    "CPU": {
+      "displayed": true,
+      "enabled": true
+    },
+    "DMA": {
+      "displayed": true,
+      "enabled": true
+    },
+    "GTE": {
+      "displayed": true,
+      "enabled": true
+    },
+    "HARDWARE": {
+      "displayed": true,
+      "enabled": true
+    },
+    "IRQ": {
+      "displayed": true,
+      "enabled": true
+    },
+    "KERNEL": {
+      "displayed": true,
+      "enabled": true
+    },
+    "MEMORY": {
+      "displayed": true,
+      "enabled": true
+    },
+    "MIPS": {
+      "displayed": true,
+      "enabled": true
+    },
+    "SIO0": {
+      "displayed": true,
+      "enabled": true
+    },
+    "SIO1": {
+      "displayed": true,
+      "enabled": true
+    },
+    "UI": {
+      "displayed": true,
+      "enabled": true
+    },
+    "UNCATEGORIZED": {
+      "displayed": true,
+      "enabled": true
+    }
+  }
 }

psx.c

@@ -189,17 +189,24 @@ int LoadLevelCD(const char*const LevelName, u_long * LoadAddress){
 
 void SwitchLevel(const char*const LevelName,  u_long * LoadAddress, LEVEL * curLevel, LEVEL * loadLevel ){
     
-    ScrRst();
+    //~ ScrRst();
-    
+        
-    //~ LoadLevelCD( LevelName, LoadAddress );
-    
     LvlPtrSet( curLevel, loadLevel);
-
+    
+    // Reload textures
+    
     for (int k = 0; k < *curLevel->meshes_length ; k++){
 
         LoadTexture(curLevel->meshes[k]->tim_data, curLevel->meshes[k]->tim);
 
     }
+    
+    // BG texture
+    
+    if (curLevel->camPtr->tim_data){
+        
+        LoadTexture(curLevel->camPtr->tim_data, curLevel->camPtr->BGtim);
+    }
 
 };