diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f471ef..0ec8410 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,6 @@ if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G) generate_g1a(TARGET myaddin OUTPUT "CCJDemo.g1a" NAME "MyAddin" ICON assets-fx/icon.png) elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50) - generate_g3a(TARGET myaddin OUTPUT "CCJDemo.g3a" - NAME "CCJDemo" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png) + generate_g3a(TARGET myaddin OUTPUT "CCJDemo.g3a" VERSION 01.000.0000 + NAME "CCJDemos" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png) endif() diff --git a/Demo.layout b/Demo.layout index b421248..eea4e49 100644 --- a/Demo.layout +++ b/Demo.layout @@ -4,23 +4,17 @@ - + - + - + - + - + - - - - - - diff --git a/src/main.c b/src/main.c index 4e3f8ca..c28eea0 100644 --- a/src/main.c +++ b/src/main.c @@ -774,7 +774,7 @@ float sr = 1.0; void init_module8() { PIXELZOOM = 2; - SPEED_UP = 1; + SPEED_UP = 2; SCR_WID_PIXEL = DWIDTH/PIXELZOOM; SCR_HEI_PIXEL = MAXHEIGHT/PIXELZOOM; MAX_ITERATION = 256/SPEED_UP; @@ -890,11 +890,10 @@ float sens = 1.0f; void init_module9() { - zoomfactor = 1.0f; sens = 1.0f; - PIXELZOOM = 2; - SPEED_UP = 3; + PIXELZOOM = 3; + SPEED_UP = 2; SCR_WID_PIXEL = DWIDTH/PIXELZOOM; SCR_HEI_PIXEL = MAXHEIGHT/PIXELZOOM; MAX_ITERATION = 256/SPEED_UP; @@ -990,17 +989,22 @@ void draw_Mandelbrot( float xmi, float ymi, float xma, float yma) void run_module9( void ) { - float x0 = -0.7746806106269039 - 4.0f/zoomfactor; - float x1 = -0.7746806106269039 + 4.0f/zoomfactor; - float y0 = -0.1374168856037867 - 1.5f/zoomfactor; - float y1 = -0.1374168856037867 + 1.5f/zoomfactor; + float x0 = -0.16 - 4.0f/zoomfactor; + float x1 = -0.16 + 4.0f/zoomfactor; + float y0 = 1.0405 - 1.5f/zoomfactor; + float y1 = 1.0405 + 1.5f/zoomfactor; + + //float x0 = -0.7746806106269039 - 4.0f/zoomfactor; + //float x1 = -0.7746806106269039 + 4.0f/zoomfactor; + //float y0 = -0.1374168856037867 - 1.5f/zoomfactor; + //float y1 = -0.1374168856037867 + 1.5f/zoomfactor; draw_Mandelbrot( x0, y0, x1, y1); if (sens>0) zoomfactor*=1.2f; else zoomfactor/=1.2f; - if (zoomfactor==100 || zoomfactor==1 ) sens*=-1; + if (zoomfactor>=1000 || zoomfactor<=1 ) sens*=-1; } @@ -1012,7 +1016,7 @@ void run_module9( void ) extern bopti_image_t bglens3, eye; static int xpath[2048]; static int ypath[2048]; -#define NUMBER_OF_BOBS 200 +#define NUMBER_OF_BOBS 512 uint32_t i = 0, j = 40, k, l, m; bool firstrun = true; @@ -1194,7 +1198,7 @@ int main(void) dprint_opt(165, 212, moduleToRun==7?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "FIRE" ); dprint_opt(231, 212, moduleToRun==8?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "JULIA" ); dprint_opt(297, 212, moduleToRun==9?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "MANDEL" ); - dprint_opt(363, 212, moduleToRun==10?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "FLYBOBS" ); + dprint_opt(363, 212, moduleToRun==10?C_RGB(255,0,0):C_RGB(255,255,255), C_NONE, DTEXT_CENTER, DTEXT_CENTER, "BOBS" ); } dupdate();