v1.1.7 | 2024/03/11 22:19 | Made more things work with the config fil…

…e, and got the display selector to work
ZERICO2005 · Mar 12, 2024 · e204a37 · e204a37
1 parent de2a5a4
commit e204a37
Show file tree

Hide file tree

Showing 19 changed files with 504 additions and 737 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,8 +35,8 @@ add_executable(${PROJECT_NAME} ${SRC_FILES} ${IMGUI_FILES})
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${IMGUI_DIR})
 # Compiler Flags Debug(-g -O0) Release(-O3)
-set(OPT_FLAG -g -O3)
+set(OPT_FLAG -g -O0)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always")
 set(MARCH_FLAGS "")
-target_compile_options(${PROJECT_NAME} PUBLIC ${OPT_FLAG} ${MARCH_FLAGS} -fdiagnostics-color=always -Wall -Wno-unused-variable -Wno-comment)
+target_compile_options(${PROJECT_NAME} PUBLIC ${OPT_FLAG} ${MARCH_FLAGS} -fdiagnostics-color=always -Wall -Wshadow -Wno-unused-variable -Wno-comment)
 target_link_libraries(${PROJECT_NAME} PUBLIC -static-libgcc -static-libstdc++ SDL2 SDL2main OpenCL quadmath ${OpenCV_LIBS})
diff --git a/src/Program_Def.h b/src/Program_Def.h
@@ -23,7 +23,7 @@
 #define PROGRAM_DATE "2024/03/11" /* YYYY/MM/DD */
 #define PROGRAM_V_MAJOR 1
 #define PROGRAM_V_MINOR 1
-#define PROGRAM_V_PATCH 6
+#define PROGRAM_V_PATCH 7
 #define PROGRAM_V_TAG "Alpha"
 #define PROGRAM_VERSION STR_N(PROGRAM_V_MAJOR) "." STR_N(PROGRAM_V_MINOR) "." STR_N(PROGRAM_V_PATCH) " " PROGRAM_V_TAG
 

diff --git a/src/bitGraphics.cpp b/src/bitGraphics.cpp
@@ -1,5 +1,5 @@
 /*
-**	Author: zerico2005 (2023)
+**	Author: zerico2005 (2023-2024)
 **	Project: ABS-Fractal-Explorer
 **	License: MIT License
 **	A copy of the MIT License should be included with

diff --git a/src/bitGraphics.h b/src/bitGraphics.h
@@ -1,5 +1,5 @@
 /*
-**	Author: zerico2005 (2023)
+**	Author: zerico2005 (2023-2024)
 **	Project: ABS-Fractal-Explorer
 **	License: MIT License
 **	A copy of the MIT License should be included with

diff --git a/src/buildCL.cpp b/src/buildCL.cpp
@@ -1,5 +1,5 @@
 /*
-**	Author: zerico2005 (2023)
+**	Author: zerico2005 (2023-2024)
 **	Project: ABS-Fractal-Explorer
 **	License: MIT License
 **	A copy of the MIT License should be included with

diff --git a/src/buildCL.h b/src/buildCL.h
@@ -1,5 +1,5 @@
 /*
-**	Author: zerico2005 (2023)
+**	Author: zerico2005 (2023-2024)
 **	License: MIT License
 **	A copy of the MIT License should be included with
 **	this project. If not, see https://opensource.org/license/MIT

diff --git a/src/display_GUI.cpp b/src/display_GUI.cpp
diff --git a/src/display_GUI.h b/src/display_GUI.h
@@ -11,7 +11,7 @@
 
 #include "Common_Def.h"
 #include "Program_Def.h"
-
+#include "user_data.h"
 #include "imgui.h"
 
 // struct Display_GUI {
@@ -21,6 +21,10 @@
 // }; typedef struct Display_GUI Display_GUI;
 
 int render_IMGUI();
+void refresh_IMGUI(User_Configuration_Data& config);
+
+// 0 Classic, 1 Dark, 2 Light
+void set_IMGUI_Theme(int_enum theme);
 
 void horizontal_buttons_IMGUI(ImGuiWindowFlags window_flags);
 

diff --git a/src/fracCL.cl b/src/fracCL.cl
@@ -1,5 +1,5 @@
 /*
-**	Author: zerico2005 (2023)
+**	Author: zerico2005 (2023-2024)
 **	Project: ABS-Fractal-Explorer
 **	License: MIT License
 **	A copy of the MIT License should be included with

diff --git a/src/fracCL.cpp b/src/fracCL.cpp
@@ -1,5 +1,5 @@
 /*
-**	Author: zerico2005 (2023)
+**	Author: zerico2005 (2023-2024)
 **	Project: ABS-Fractal-Explorer
 **	License: MIT License
 **	A copy of the MIT License should be included with

diff --git a/src/fracCL.h b/src/fracCL.h
@@ -1,5 +1,5 @@
 /*
-**	Author: zerico2005 (2023)
+**	Author: zerico2005 (2023-2024)
 **	Project: ABS-Fractal-Explorer
 **	License: MIT License
 **	A copy of the MIT License should be included with

diff --git a/src/frac_preprocessor.cpp b/src/frac_preprocessor.cpp
@@ -19,40 +19,40 @@ int preCalc_Frac_Param(
 	const ABS_Mandelbrot& frac
 ) {
 	/* Type */
-	param_PC.polarMandelbrot = frac.polarMandelbrot;
+		param_PC.polarMandelbrot = frac.polarMandelbrot;
 	/* Coordinates */
-	param_PC.r = frac.r;
-	param_PC.i = frac.i;
-	param_PC.zr = frac.zr;
-	param_PC.zi = frac.zi;
-	param_PC.zoom_PC = pow(10.0,frac.zoom);
+		param_PC.r = frac.r;
+		param_PC.i = frac.i;
+		param_PC.zr = frac.zr;
+		param_PC.zi = frac.zi;
+		param_PC.zoom_PC = pow(10.0,frac.zoom);
 	/* Transformation */
-	param_PC.rotSin_PC = sin(frac.rot);
-	param_PC.rotCos_PC = cos(frac.rot);
-	param_PC.sX = frac.sX;
-	param_PC.sY = frac.sY;
+		param_PC.rotSin_PC = sin(frac.rot);
+		param_PC.rotCos_PC = cos(frac.rot);
+		param_PC.sX = frac.sX;
+		param_PC.sY = frac.sY;
 	/* Parameters */
-	param_PC.maxItr = frac.maxItr;
-	param_PC.formula = frac.formula;
-	param_PC.breakoutValue = frac.breakoutValue;
-		param_PC.power = frac.power;
-		param_PC.polarPower = frac.polarPower;
+		param_PC.maxItr = frac.maxItr;
+		param_PC.formula = frac.formula;
+		param_PC.breakoutValue = frac.breakoutValue;
+			param_PC.power = frac.power;
+			param_PC.polarPower = frac.polarPower;
 	/* Coloring */
-	param_PC.smoothColoring = frac.smoothColoring;
-	param_PC.r_Amp = frac.rA;
-	param_PC.r_Freq = frac.rF;
-	param_PC.r_Phase = frac.rP;
-	param_PC.g_Amp = frac.gA;
-	param_PC.g_Freq = frac.gF;
-	param_PC.g_Phase = frac.gP;
-	param_PC.b_Amp = frac.bA;
-	param_PC.b_Freq = frac.bF;
-	param_PC.b_Phase = frac.bP;
-	param_PC.interior_Amp = frac.bA;
-	param_PC.interior_Freq = frac.bF;
-	param_PC.interior_Phase = frac.bP;
-	param_PC.interior_Alpha = 0xFF;
-	param_PC.exterior_Alpha = 0xFF;
+		param_PC.smoothColoring = frac.smoothColoring;
+		param_PC.r_Amp = frac.rA;
+		param_PC.r_Freq = frac.rF;
+		param_PC.r_Phase = frac.rP;
+		param_PC.g_Amp = frac.gA;
+		param_PC.g_Freq = frac.gF;
+		param_PC.g_Phase = frac.gP;
+		param_PC.b_Amp = frac.bA;
+		param_PC.b_Freq = frac.bF;
+		param_PC.b_Phase = frac.bP;
+		param_PC.interior_Amp = frac.bA;
+		param_PC.interior_Freq = frac.bF;
+		param_PC.interior_Phase = frac.bP;
+		param_PC.interior_Alpha = 0xFF;
+		param_PC.exterior_Alpha = 0xFF;
 	return 0;
 }
 

diff --git a/src/frac_preprocessor.h b/src/frac_preprocessor.h
@@ -17,40 +17,40 @@
 // Stores precalculated (PC) fractal parameters. Struct will be read only in rendering engines
 struct Frac_Param_PC {
 	/* Type */
-	bool polarMandelbrot;
+		bool polarMandelbrot;
 	/* Coordinates */
-	fp128 r;
-	fp128 i;
-	fp128 zr;
-	fp128 zi;
-	fp64 zoom_PC;
+		fp128 r;
+		fp128 i;
+		fp128 zr;
+		fp128 zi;
+		fp64 zoom_PC;
 	/* Transformation */
-	fp128 rotSin_PC;
-	fp128 rotCos_PC;
-	fp64 sX;
-	fp64 sY;
+		fp128 rotSin_PC;
+		fp128 rotCos_PC;
+		fp64 sX;
+		fp64 sY;
 	/* Parameters */
-	uint32_t maxItr;
-	uint64_t formula;
-	fp64 breakoutValue;
-		uint32_t power;
-		fp64 polarPower;
+		uint32_t maxItr;
+		uint64_t formula;
+		fp64 breakoutValue;
+			uint32_t power;
+			fp64 polarPower;
 	/* Coloring */
-	bool smoothColoring;
-	fp64 r_Amp;
-	fp64 r_Freq;
-	fp64 r_Phase;
-	fp64 g_Amp;
-	fp64 g_Freq;
-	fp64 g_Phase;
-	fp64 b_Amp;
-	fp64 b_Freq;
-	fp64 b_Phase;
-	fp64 interior_Amp;
-	fp64 interior_Freq;
-	fp64 interior_Phase;
-	uint8_t interior_Alpha;
-	uint8_t exterior_Alpha;
+		bool smoothColoring;
+		fp64 r_Amp;
+		fp64 r_Freq;
+		fp64 r_Phase;
+		fp64 g_Amp;
+		fp64 g_Freq;
+		fp64 g_Phase;
+		fp64 b_Amp;
+		fp64 b_Freq;
+		fp64 b_Phase;
+		fp64 interior_Amp;
+		fp64 interior_Freq;
+		fp64 interior_Phase;
+		uint8_t interior_Alpha;
+		uint8_t exterior_Alpha;
 }; typedef struct Frac_Param_PC Frac_Param_PC;
 
 // Read only precalculated values