diff options
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 88 |
1 files changed, 28 insertions, 60 deletions
@@ -55,9 +55,6 @@ #include <air.h> #include <icon.h> #include <console.h> -#ifdef PYCONSOLE -#include "pythonconsole.h" -#endif #ifdef LUACONSOLE #include "luaconsole.h" #endif @@ -1513,7 +1510,7 @@ int main(int argc, char *argv[]) memset(vid_buf, 0, (XRES+BARSIZE)*YRES*PIXELSIZE); draw_walls(vid_buf); update_particles(vid_buf); - draw_parts(vid_buf); + render_parts(vid_buf); render_fire(vid_buf); } @@ -1625,10 +1622,6 @@ int main(int argc, char *argv[]) #ifdef LUACONSOLE luacon_open(); #endif -#ifdef PYCONSOLE - pycon_open(); -#endif - #ifdef MT numCores = core_count(); #endif @@ -1726,7 +1719,6 @@ int main(int argc, char *argv[]) } make_kernel(); - prepare_alpha(CELL, 1.0f); stamp_init(); @@ -1739,6 +1731,11 @@ int main(int argc, char *argv[]) save_presets(0); http_init(http_proxy_string[0] ? http_proxy_string : NULL); + prepare_alpha(CELL, 1.0f); + prepare_graphicscache(); + flm_data = generate_gradient(flm_data_colours, flm_data_pos, flm_data_points, 200); + plasma_data = generate_gradient(plasma_data_colours, plasma_data_pos, plasma_data_points, 200); + if (cpu_check()) { error_ui(vid_buf, 0, "Unsupported CPU. Try another version."); @@ -1764,9 +1761,6 @@ int main(int argc, char *argv[]) if(aheat_enable) update_airh(); } -#ifdef OpenGL - ClearScreen(); -#else if(ngrav_enable && cmode==CM_FANCY) { @@ -1782,6 +1776,22 @@ int main(int argc, char *argv[]) gravity_mask(); gravwl_timeout--; } +#ifdef OGLR + if (cmode==CM_PERS)//save background for persistent, then clear + { + clearScreen(0.01f); + memset(part_vbuf, 0, (XRES+BARSIZE)*YRES*PIXELSIZE); + } + else //clear screen every frame + { + clearScreen(1.0f); + memset(part_vbuf, 0, (XRES+BARSIZE)*YRES*PIXELSIZE); + if (cmode==CM_VEL || cmode==CM_PRESS || cmode==CM_CRACK || (cmode==CM_HEAT && aheat_enable))//air only gets drawn in these modes + { + draw_air(part_vbuf); + } + } +#else if (cmode==CM_VEL || cmode==CM_PRESS || cmode==CM_CRACK || (cmode==CM_HEAT && aheat_enable))//air only gets drawn in these modes { draw_air(part_vbuf); @@ -1790,7 +1800,7 @@ int main(int argc, char *argv[]) { memcpy(part_vbuf, pers_bg, (XRES+BARSIZE)*YRES*PIXELSIZE); memset(part_vbuf+((XRES+BARSIZE)*YRES), 0, ((XRES+BARSIZE)*YRES*PIXELSIZE)-((XRES+BARSIZE)*YRES*PIXELSIZE)); -} + } else //clear screen every frame { memset(part_vbuf, 0, (XRES+BARSIZE)*YRES*PIXELSIZE); @@ -1845,7 +1855,7 @@ int main(int argc, char *argv[]) #endif } - draw_parts(part_vbuf); //draw particles + render_parts(part_vbuf); //draw particles draw_other(part_vbuf); if(debug_flags & (DEBUG_PERFORMANCE_CALC|DEBUG_PERFORMANCE_FRAME)) @@ -1922,8 +1932,11 @@ int main(int argc, char *argv[]) } fire_fc = (fire_fc+1) % 3; } + +#ifndef OGLR if (cmode==CM_FIRE||cmode==CM_BLOB||cmode==CM_FANCY) render_fire(part_vbuf); +#endif render_signs(part_vbuf); @@ -2081,11 +2094,6 @@ int main(int argc, char *argv[]) sdl_rkey = 0; } #endif -#ifdef PYCONSOLE - if(sdl_key){ - pycon_keypress(sdl_key, sdl_mod); - } -#endif if (sys_shortcuts==1)//all shortcuts can be disabled by python scripts { if (sdl_key=='q' || sdl_key==SDLK_ESCAPE) @@ -3549,41 +3557,7 @@ int main(int argc, char *argv[]) if (console_mode) { -#ifdef PYCONSOLE - if (pyready==1 && pygood==1) - { - char *console; - //char error[255] = "error!"; - sys_pause = 1; - console = console_ui(vid_buf,console_error,console_more); - console = mystrdup(console); - strcpy(console_error,""); - if (process_command_py(vid_buf, console, console_error)==-1) - { - free(console); - break; - } - free(console); - if (!console_mode) - hud_enable = 1; - } - else - { - char *console; - sys_pause = 1; - console = console_ui(vid_buf,console_error,console_more); - console = mystrdup(console); - strcpy(console_error,""); - if (process_command_old(vid_buf, console, console_error)==-1) - { - free(console); - break; - } - free(console); - if (!console_mode) - hud_enable = 1; - } -#elif defined LUACONSOLE +#ifdef LUACONSOLE char *console; sys_pause = 1; console = console_ui(vid_buf, console_error, console_more); @@ -3615,9 +3589,6 @@ int main(int argc, char *argv[]) } //execute python step hook -#ifdef PYCONSOLE - pycon_step(); -#endif sdl_blit(0, 0, XRES+BARSIZE, YRES+MENUSIZE, vid_buf, XRES+BARSIZE); //Setting an element for the stick man @@ -3644,9 +3615,6 @@ int main(int argc, char *argv[]) #ifdef LUACONSOLE luacon_close(); #endif -#ifdef PYCONSOLE - pycon_close(); -#endif #ifdef PTW32_STATIC_LIB pthread_win32_thread_detach_np(); pthread_win32_process_detach_np(); |