Rewind progress bar

Author: Maciek

CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.6)
 project(rin C CXX)
+add_executable(testProgress tools.c)
 include(/usr/local/pspdev/psp/share/cmake/PSP.cmake)
 
 set(CMAKE_CXX_STANDARD 11)
@@ -27,5 +28,6 @@ set(return_list ".")
 
 
 
-add_executable(rin ${all_src} tools.c tools.h menu_rewind.c menu_rewind.h menu_credits.c menu_credits.h)
+add_executable(rin ${all_src} tools.c tools.h menu_rewind.c menu_rewind.h menu_credits.c menu_credits.h tools.c)
+
 set_target_properties(rin PROPERTIES LINKER_LANGUAGE CXX)

Makefile

@@ -6,7 +6,7 @@ MODE=REL
 TARGET = rin_rm
 OBJS = gbcore/cpu.o gbcore/gb.o gbcore/lcd.o gbcore/sgb.o \
 	gbcore/rom.o gbcore/mbc.o gbcore/apu.o gbcore/cheat.o \
-	main.o pg.o renderer.o rewind.o menu.o filer.o sound.o saveload.o image.o gz.o menu_rewind.o menu_credits.o
+	main.o pg.o renderer.o rewind.o menu.o filer.o sound.o saveload.o image.o gz.o menu_rewind.o menu_credits.o tools.o
 
 INCDIR		=
 

font.c

@@ -9,10 +9,42 @@ const unsigned char font[]={
 	0x10,0x10,0x10,0x10,0x7C,0x38,0x10,0x00,	//��
 
 	0x00,0x20,0x60,0xFE,0x60,0x20,0x00,0x00,	//��
-	0xCC,0xCC,0x33,0x33,0xCC,0xCC,0x33,0x33,
-	0xCC,0xCC,0x33,0x33,0xCC,0xCC,0x33,0x33,
-	0xCC,0xCC,0x33,0x33,0xCC,0xCC,0x33,0x33,
-	0xCC,0xCC,0x33,0x33,0xCC,0xCC,0x33,0x33,
+//	0xCC,0xCC,0x33,0x33,0xCC,0xCC,0x33,0x33,
+	0b01111110,                                 // 9 cursor for rewind progress bar
+	0b01111110,
+	0b01111110,
+	0b01111110,
+	0b01111110,
+	0b01111110,
+	0b01111110,
+	0b11111111,
+	//0xCC,0xCC,0x33,0x33,0xCC,0xCC,0x33,0x33,
+	0b00000000,                                 // 10 main builder for rewind progress bar
+	0b00000000,
+	0b00000000,
+	0b00000000,
+	0b00000000,
+	0b00000000,
+	0b00000000,
+	0b11111111,
+//	0xCC,0xCC,0x33,0x33,0xCC,0xCC,0x33,0x33,
+	0b00000011,                                 // 11 left limiter for rewind progress bar
+	0b00000011,
+	0b00000011,
+	0b00000011,
+	0b00000011,
+	0b00000011,
+	0b00000011,
+	0b00000011,
+//	0xCC,0xCC,0x33,0x33,0xCC,0xCC,0x33,0x33,
+	0b11000000,                                 // 12 right limiter for rewind progress bar
+	0b11000000,
+	0b11000000,
+	0b11000000,
+	0b11000000,
+	0b11000000,
+	0b11000000,
+	0b11000000,
 	0xCC,0xCC,0x33,0x33,0xCC,0xCC,0x33,0x33,
 	0xCC,0xCC,0x33,0x33,0xCC,0xCC,0x33,0x33,
 	0xCC,0xCC,0x33,0x33,0xCC,0xCC,0x33,0x33,

main.c

@@ -262,7 +262,7 @@ void mainloop(void)
 				wavout_enable=0;
 
 				while(1){
-
+					renderer_set_msg(get_rewind_progress_bar());
 					//begin rewinds
 					if( read_rewind_state() > 0 ){
 

menu_credits.c

@@ -24,6 +24,7 @@ static char* credits[] = {
 	"    - Dedicated menu for rewind,",
 	"    - Support for extra memory (PSP Slim),",
 	"    - Adjustable memory and states amount in rewind,",
+	"    - Progress bar for actual rewind status,",
 	"    - Fixed crash when loading game with a different",
 	"      save size than the previous one,",
 	"    - Fixed crash when putting PSP to sleep while",

rewind.c

@@ -22,9 +22,28 @@ struct rewind_state{
 	struct rewind_state *prev;
 };
 
-
 struct rewind_state *ptr_rewind_states, *prev_state, *next_state;
 
+int get_used_rewind_states_number(){
+	int retVal = 0;
+	if(setting.rewind_enabled && ptr_rewind_states != NULL){
+		struct rewind_state* act = ptr_rewind_states->next;
+		while(act != ptr_rewind_states){
+			if(act->have_data){
+				retVal++;
+			}
+			act = act->next;
+		}
+	}
+	return retVal;
+}
+
+char* get_rewind_progress_bar(){
+	int max = num_rwnd_states;
+	int act = get_used_rewind_states_number();
+
+	return get_progress_bar(max,act);
+}
 
 static void set_number_of_rewind_states(int *number_of_states);
 

rewind.h

@@ -38,5 +38,6 @@ void test_available_memory(void);
 unsigned establish_max_rewind_memory(void);
 unsigned get_current_rewind_memory(SETTING local);
 void print_rewind_debug_info(SETTING local,char* info);
+char* get_rewind_progress_bar();
 
 #endif

tools.c

@@ -0,0 +1,56 @@
+//
+// Created by Maciej Barczak on 19.08.2018.
+//
+#include <stdio.h>
+#include <memory.h>
+#include "tools.h"
+
+char *get_progress_bar(int max, int act) {
+#define BAR_LENGTH  60
+#define MAX_PROGRESS (BAR_LENGTH+1)
+#define MAX_STR 200
+	const char LIMITER_CHAR_LEFT = 11;
+	const char LIMITER_CHAR_RIGHT = 12;
+	const char ACT_CHAR = 9;
+	const char BUILD_CHAR = 10;
+	static char progress[MAX_PROGRESS];
+	static char string[MAX_STR];
+	if (max == 0) {
+		string[0] = '\0';
+	} else {
+		memset(progress, BUILD_CHAR, MAX_PROGRESS);
+
+		int actPercentage = MAX(MIN((100 * act) / max, 100), 0);
+		int actInBar = (((BAR_LENGTH - 2) * actPercentage) / 100) + 1;
+
+		progress[0] = LIMITER_CHAR_LEFT;
+		progress[BAR_LENGTH - 1] = LIMITER_CHAR_RIGHT;
+		progress[BAR_LENGTH] = '\0';
+		if (actInBar == 0) {
+			actInBar = 1;
+		} else if (actInBar == BAR_LENGTH - 1) {
+			actInBar = BAR_LENGTH - 2;
+		}
+		progress[actInBar] = ACT_CHAR;
+
+		memset(string, 0, MAX_STR);
+//		snprintf(string, MAX_STR, " Rewind :%s", progress);
+		snprintf(string, MAX_STR, "%s", progress);
+	}
+	return string;
+}
+
+//#define TESTING
+
+#ifdef TESTING
+
+#include <stdio.h>
+
+int main() {
+	char *progress = get_progress_bar( 1478, 1500);
+	printf("Progress : %s , length: %d\n", progress, strlen(progress));
+
+	return 0;
+}
+
+#endif // TESTING

tools.h

@@ -20,5 +20,5 @@ static inline unsigned byte2kb(unsigned bytes){
 	return bytes/1024;
 }
 
-void ftoa(float n, char *res, int afterpoint);
+char* get_progress_bar(int max, int act);
 #endif //RIN_TOOLS_H