diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt new file mode 100644 index 0000000..9f4994e --- /dev/null +++ b/examples/CMakeLists.txt @@ -0,0 +1,28 @@ +project(TartTest) +#add_subdirectory(externals) +set( CMAKE_CXX_STANDARD 11) +set( CMAKE_CXX_STANDARD_REQUIRED ON) +set( SOURCES + main.cpp + test_tart.cpp + test_term.cpp +) + +#set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/tests) +# +#add_executable(${PROJECT_NAME} ${SOURCES} ) +#target_link_libraries(${PROJECT_NAME} TartLib PickleLib) +# +#if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +# add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing") +#endif() +#if(CMAKE_SYSTEM_NAME STREQUAL "Windows") +# add_test(${PROJECT_NAME} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/testing.exe") +#endif() +# +#project(InputTartTest) +#set( CMAKE_CXX_STANDARD 11) +#set( CMAKE_CXX_STANDARD_REQUIRED ON) +#add_executable(${PROJECT_NAME} input.cpp ) +#target_link_libraries(${PROJECT_NAME} TartLib PickleLib) +add_subdirectory(render_test) diff --git a/examples/render_test/CMakeLists.txt b/examples/render_test/CMakeLists.txt new file mode 100644 index 0000000..284f22d --- /dev/null +++ b/examples/render_test/CMakeLists.txt @@ -0,0 +1,7 @@ +set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/tests) +project(render_test) + +set( CMAKE_CXX_STANDARD 11) +set( CMAKE_CXX_STANDARD_REQUIRED ON) +add_executable(${PROJECT_NAME} main.cpp ) +target_link_libraries(${PROJECT_NAME} TartLib) diff --git a/examples/render_test/main.cpp b/examples/render_test/main.cpp new file mode 100644 index 0000000..db31e42 --- /dev/null +++ b/examples/render_test/main.cpp @@ -0,0 +1,81 @@ +#include +#include +#include +#include +#include + +//int main (int argc, char *argv[]) { +// struct tart_window window = tart_create_window(); +// struct tart_buffer mainbuff = tart_create_buffer(109, {40,20},{20,20}); +// struct tart_cell* cells = (struct tart_cell*)malloc(mainbuff.cell_count * sizeof(struct tart_cell)); +// for(int i = 1; i < mainbuff.cell_count; i += 2) { +// cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_BLACK_FOREGROUND, TART_COLOR_WHITE_BACKGROUND); +// } +// for(int i = 0; i < + mainbuff.cell_count; i += 2) { +// cells[i] = tart_create_cell('^', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_BLACK_BACKGROUND); +// } +// tart_add_cells_to_buffer(&mainbuff, cells); +// +// struct tart_vec2 positions[4] = {{0,0},{0,1},{1,0},{1,1}}; +// struct tart_cell cell = tart_create_cell('0', TART_STYLE_BLINKING, TART_COLOR_RED_FOREGROUND, TART_COLOR_GREEN_BACKGROUND); +// struct tart_cell cellss[4] = {cell,cell,cell,cell}; +// +// struct tart_csprite sprite = tart_csprite(cellss,positions,4); +// tart_draw_csprite_position(&mainbuff, sprite, {2,2}); +// tart_draw_csprite_position(&mainbuff, sprite, {5,2}); +// tart_draw_csprite_position(&mainbuff, sprite, {5,5}); +// tart_draw_csprite_position(&mainbuff, sprite, {39,18}); +// +// float x = 0; +// tart_byte layer = tart_add_buffer(&window, mainbuff); +// char t[1] = {'0'}; +// struct tart_vec2 p = {0,0}; +// +// term_disable_cursor(); +// term_threaded_input_init(); +// char* bbuf = term_tinputb(); +// for(;;) { +// printf("\033[H"); +// struct tart_buffer* buf = tart_get_buffer(&window, 0); +// tart_draw_csprite_position(buf, sprite, {3,18}); +// tart_draw_csprite_position(buf, sprite, p); +// tart_draw_window(&window, t); +// tart_restore_window(&window); +// tart_restore_buffer(buf); +// if(term_tinput() == 's') { +// x += 0.01; +// } +// if(term_tinput() == 'q') { +// break; +// } +// // p.x = (int)x; +// } +// term_threaded_input_stop(); +// term_enable_cursor(); +// exit(0); +// //term_getche(); +// //term_threaded_input_stop(); +// return 0; +//} +char* bbuf; + +int main (int argc, char *argv[]) { + int n; + int counter = 0; + term_disable_cursor(); + term_threaded_input_init(); + bbuf = term_tinputb(); + while(bbuf[0] != 'q') { + + std::cout << counter++ << '['; + for (int i = 0; i < 8; i++) { + std::cout << bbuf[i] << ','; + } + std::cout << "] \r"; + } + std::cout << '\n'; + term_threaded_input_stop(); + term_enable_cursor(); + exit(0); + return 0; +} diff --git a/includes/tart.h b/includes/tart.h index 16a31a8..eb629c9 100644 --- a/includes/tart.h +++ b/includes/tart.h @@ -24,8 +24,8 @@ extern "C" { #define NULL_CELL (struct tart_cell){{0,0,0},{0,0,0},0,0,0} #define TART_CELL_DATA_SIZE 16 // todo add number #else -#define NULL_CELL (struct tart_cell){0,0,0,0} -#define TART_CELL_DATA_SIZE 16 +#define NULL_CELL (struct tart_cell){0,0,0,' '} +#define TART_CELL_DATA_SIZE 20 #endif #define TART_OK 0 @@ -109,6 +109,18 @@ struct tart_cell { }; #endif +struct tart_cstring { + struct tart_cell* data; + long size; +}; + +struct tart_csprite { + struct tart_cell* data; + struct tart_vec2* position; + struct tart_vec2 bounds; + long size; +}; + /* Tart Buffer * * The Buffer is a contner that holds all of the cells for that buffer. @@ -147,6 +159,7 @@ struct tart_window { struct tart_window tart_create_window(); struct tart_buffer tart_create_buffer(tart_id id, struct tart_vec2 size, struct tart_vec2 position); +tart_byte tart_restore_window(struct tart_window*); #ifdef TART_RGB_COLORS struct tart_cell tart_create_cell(char display, tart_byte style, struct tart_rgb foreground, struct tart_rgb background); @@ -154,10 +167,25 @@ struct tart_cell tart_create_cell(char display, tart_byte style, struct tart_rgb struct tart_cell tart_create_cell(char display, tart_byte style, tart_byte foreground, tart_byte background); #endif +/* tart_add_buffer + * + * This adds a buffer to the window. + * + * tart_byte tart_add_buffer(struct tart_window*, struct struct tart_buffer*) + */ tart_byte tart_add_buffer(struct tart_window*, struct tart_buffer); +/* tart_remove_buffer + * + * This will remove the buffer using the *tart_id*. + */ tart_byte tart_remove_buffer(struct tart_window*, tart_id); +/* tart_set_buffer + * + * This will replace the the buffer at the index *(tart_byte)*. + */ tart_byte tart_set_buffer(struct tart_window*, struct tart_buffer, tart_byte); + struct tart_buffer* tart_get_buffer(struct tart_window*, tart_byte); struct tart_cell* tart_get_cell(struct tart_buffer*, int); @@ -167,6 +195,23 @@ tart_byte tart_draw_window(struct tart_window*, char*); tart_byte tart_add_cells_to_buffer(struct tart_buffer*, struct tart_cell*); +// rendering +// Resering positionial cells. +struct tart_cstring tart_cstring(char* string, long, struct tart_cell type); +tart_byte tart_cstring_free(struct tart_cstring*); +struct tart_cstring tart_cstring_append(struct tart_cstring*, struct tart_cstring*); + +struct tart_csprite tart_csprite(struct tart_cell*, struct tart_vec2*, long); +tart_byte tart_csprite_free(struct tart_csprite*); + +tart_byte tart_draw_cell_position(struct tart_buffer*, struct tart_cell, struct tart_vec2); +tart_byte tart_draw_cstring_position(struct tart_buffer*, struct tart_cstring, struct tart_vec2); +tart_byte tart_draw_csprite_position(struct tart_buffer*, struct tart_csprite, struct tart_vec2); +/* + * tart_restore_buffer sets the buffer to NULL_CELL. + * */ +tart_byte tart_restore_buffer(struct tart_buffer*); + #ifdef __cplusplus } #endif diff --git a/source/tart.c b/source/tart.c index eaa7c0b..270a2b6 100644 --- a/source/tart.c +++ b/source/tart.c @@ -15,16 +15,34 @@ struct tart_window tart_create_window() { struct tart_window window; window.buffer_count = 0; for(int i = 0; i < 0xFF; i++) { - window.buffers[i] = tart_create_buffer(0, (struct tart_vec2){0,0},(struct tart_vec2){0,0}); + window.buffers[i] = tart_create_buffer(0, (struct tart_vec2){0,0}, + (struct tart_vec2){0,0}); } window.size = term_current_size(); + + int dataSize = (window.size.x * window.size.y * sizeof(char) * + TART_CELL_DATA_SIZE) + 100; + + window.data = malloc(dataSize); + for(int g = 0; g < dataSize; g++) { + window.data[g] = '\0'; + } + window.data_count = dataSize; return window; } -struct tart_buffer tart_create_buffer(tart_id id, struct tart_vec2 size, struct tart_vec2 position) { +tart_byte tart_restore_window(struct tart_window* window) { + for (int i = 0; i < window->data_count; i++) { + window->data[i] = '\0'; + } + return TART_OK; +} + +struct tart_buffer tart_create_buffer(tart_id id, struct tart_vec2 size, + struct tart_vec2 position) { unsigned int cell_count = size.x * size.y; - struct tart_cell* cells = (struct tart_cell*)malloc((size.x * size.y) * sizeof(struct tart_cell)); + struct tart_cell* cells = (struct tart_cell*)malloc(cell_count * sizeof(struct tart_cell)); for (int i = 0;i < cell_count;i++) { cells[i] = NULL_CELL; @@ -32,6 +50,7 @@ struct tart_buffer tart_create_buffer(tart_id id, struct tart_vec2 size, struct unsigned int data_count = (size.x*size.y) * TART_CELL_DATA_SIZE; struct tart_buffer buf = {cell_count,0,id,size,position,cells}; // -NOTE- dose not set the layer + buf.cell_count = cell_count; return buf; } #ifdef TART_RGB_COLORS @@ -46,7 +65,8 @@ struct tart_cell tart_create_cell(char display, tart_byte style, return (struct tart_cell){foreground,background,style,display}; } #endif -tart_byte tart_add_buffer(struct tart_window* window, struct tart_buffer buffer) { +tart_byte tart_add_buffer(struct tart_window* window, + struct tart_buffer buffer) { if(window->buffer_count <= 0xFF) { window->buffers[window->buffer_count] = buffer; window->buffer_count++; @@ -77,26 +97,132 @@ struct tart_cell tart_set_cell(struct tart_buffer* buffer, struct tart_cell cell } tart_byte tart_draw_window(struct tart_window * window, char* rend_buffer) { - int p = 0; + int offset = 0; int i = 0; + int bufferWidth = 0; for (int b = 0;b < 0xFF; b++) { - for (int y = 0; y < window->size.y; y++) { - for (int x = 0; x < window->size.x; x++) { - for (int p = 0; p < TART_CELL_DATA_SIZE;p++) { - // add data to window c buffer. - - i++; + if(window->buffers[b].cell_count == 0) + continue; + bufferWidth = window->buffers[b].size.x; + for (int y = 0; y < window->buffers[b].size.y; y++) { + for (int x = 0; x < window->buffers[b].size.x; x++) { + // add data to window c buffer. + struct tart_cell cell = window->buffers[b].cells[(y*window->buffers[b].size.x) + x]; + char pre[TART_CELL_DATA_SIZE]; + // puts cell drawing data in pre + int size = sprintf(pre, "\033[%d;%d;%dm%c\033[0;0m", + (int)cell.style, cell.foreground, + cell.background, cell.display) -1; + for(int preIdx = 0; preIdx < size; preIdx++) { + window->data[(y*window->buffers[b].size.x) + x + offset] = pre[preIdx]; + offset++; } } + //window->data[((y)*window->buffers[b].size.x) + offset + window->buffers[b].size.x] = '\n'; + offset++; + + // add cursor move command. i++; } } - printf(window->data); + fwrite(window->data, sizeof(char), window->data_count, stdout); return TART_OK; }; tart_byte tart_add_cells_to_buffer(struct tart_buffer* buffer, struct tart_cell* cells) { + for(int i = 0; i < buffer->cell_count; i++) { + buffer->cells[i] = cells[i]; + } return TART_OK; } + + +struct tart_cstring tart_cstring(char *string, long size, struct tart_cell type){ + struct tart_cstring str = {0,size}; + str.data = malloc(size * sizeof(struct tart_cell)); + for(int i = 0; i < size; i++) { + str.data[i] = type; + str.data[i].display = string[i]; + } + return str; +} + +tart_byte tart_cstring_free(struct tart_cstring* string) { + free(string->data); + string->size = 0; + return TART_OK; +} + +struct tart_cstring tart_cstring_append(struct tart_cstring* lhs, struct tart_cstring* rhs) { + struct tart_cstring ret = {0,0}; + ret.size = lhs->size + rhs->size; + ret.data = malloc(ret.size * sizeof(struct tart_cell)); + for(int i = 0; i < lhs->size; i++) { + ret.data[i] = lhs->data[i]; + } + for(int i = 0; i < rhs->size; i++) { + ret.data[lhs->size + i] = rhs->data[i]; + } + return ret; +} + +struct tart_csprite tart_csprite(struct tart_cell* cells, struct tart_vec2* positions, long size) { + + struct tart_csprite sprite = {0,0,0,size}; + sprite.data = cells; + sprite.position = positions; + for(int i = 0; i < size; i++) { + + if(positions[i].x > sprite.bounds.x) { + sprite.bounds.x = positions[i].x; + } + + if(positions[i].y > sprite.bounds.y) { + sprite.bounds.y = positions[i].y; + } + } + sprite.size = size; + return sprite; +}; + +tart_byte tart_csprite_free(struct tart_csprite* sprite) { + sprite->bounds.x = 0; + sprite->bounds.y = 0; + sprite->size = 0; + free(sprite->data); + free(sprite->position); + return TART_OK; +} + +tart_byte tart_draw_cell_position(struct tart_buffer * buffer, struct tart_cell cell, struct tart_vec2 position) { + if(buffer->size.x > position.x && buffer->size.y > position.y) { + buffer->cells[(buffer->size.x * position.y) + position.x] = cell; + } + return TART_OK; +} + +tart_byte tart_draw_cstring_position(struct tart_buffer *buffer, struct tart_cstring string, struct tart_vec2 position) { + struct tart_vec2 pos = position; + for(int i = 0; i < string.size; i++) { + tart_draw_cell_position(buffer, string.data[i], pos); + pos.x++; + } + return TART_OK; +} + +tart_byte tart_draw_csprite_position(struct tart_buffer * buffer, struct tart_csprite sprite, struct tart_vec2 basePosition) { + for(int i = 0; i < sprite.size; i++) { + struct tart_vec2 position = {sprite.position[i].x + basePosition.x, sprite.position[i].y + basePosition.y}; + tart_draw_cell_position(buffer, sprite.data[i], position); + } + return TART_OK; +} + +tart_byte tart_restore_buffer(struct tart_buffer *buffer) { + for (int i = 0; i < buffer->cell_count; i++) { + buffer->cells[i] = NULL_CELL; + } + return TART_OK; +} diff --git a/source/term.c b/source/term.c index 3b000c9..5c763cb 100644 --- a/source/term.c +++ b/source/term.c @@ -101,16 +101,19 @@ void init_termios(int args) { current.c_lflag &= ~ICANON; if(args == 0x01) { - current.c_lflag |= ECHO; + //current.c_lflag ^ ECHO; } else { - current.c_lflag &= ~ECHO; + //current.c_lflag &= ~ECHO; + current.c_lflag ^= ECHO; + //current.c_lflag |= ECHO; } - tcsetattr(0,TCSAFLUSH, ¤t); + tcsetattr(0,0, ¤t); } void reset_termios(void) { - tcsetattr(0, TCSAFLUSH, &old); + + tcsetattr(0, TCSANOW, &old); } char term_getch() { @@ -143,6 +146,7 @@ void* input_threaded_func(void* vargp) { int term_threaded_input_stop() { pthread_cancel(input_thread); + reset_termios(); return 1; } @@ -170,9 +174,9 @@ char term_tinput() { return __term_input_buffer__[0]; } void term_disable_cursor() { - fputs("\033[?25l", stdout); + printf("\033[?25l", stdout); } void term_enable_cursor() { - fputs("\033[?25h", stdout); + printf("\033[?25h", stdout); }