woodythewooden/SoftLK-lib
woodythewooden/SoftLK-lib
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improve SLK_core(.c) and SLK_layer(.c)

Browse source 
Improved code style
Added comments
Renamed SLK_running to SLK_core_running
Renamed SLK_quit to SLK_core_quit
Renamed SLK_update_viewport to SLK_render_update_viewport
Renamed SLK_update_mouse to SLK_mouse_update
This commit is contained in:
Captain4LK 2020-04-30 17:40:45 +02:00
parent 3d46410832
commit 0302a75d00
7 changed files with 130 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/efelder/main.c
View file

@ -55,7 +55,7 @@ int main(int argc, char *argv[])
{
SLK_setup(WIDTH,HEIGHT,3,"SLK Engine",1,0);
SLK_timer_set_fps(30);
SLK_show_cursor(1);
SLK_mouse_show_cursor(1);
SLK_layer_create(0,SLK_LAYER_RGB); //Layer for drawing shapes
SLK_layer_create(1,SLK_LAYER_RGB); //Layer for drawing electric field
@ -69,7 +69,7 @@ int main(int argc, char *argv[])
calculate();
while(SLK_running())
while(SLK_core_running())
{
SLK_update();

2
examples/performance/main.c
View file

@ -82,7 +82,7 @@ int main(int argc, char *argv[])
while(world.used<10)
add_entity();
while(SLK_running())
while(SLK_core_running())
{
SLK_update();

10
include/SLK/SLK_functions.h
View file

@ -33,6 +33,7 @@ float SLK_timer_get_delta();
//Render subsystem: SLK_render.c
void SLK_render_init();
void SLK_render_update();
void SLK_render_update_viewport();
//Pal sprite subsystem: SLK_sprite_pal.c
SLK_Pal_sprite *SLK_pal_sprite_create(int width, int height);
@ -103,6 +104,7 @@ int SLK_mouse_pressed(int key);
int SLK_mouse_released(int key);
void SLK_mouse_get_pos(int *x, int *y);
void SLK_mouse_show_cursor(int shown);
void SLK_mouse_update(int x, int y);
void SLK_text_input_start(char *text);
void SLK_text_input_stop();
@ -115,13 +117,11 @@ void SLK_layer_set_current(const unsigned index);
//Core subsystem: SLK_core.c
void SLK_setup(const int width, const int height, const int layer_num, const char *title, const int fullscreen, int scale);
void SLK_update();
void SLK_core_set_title(const char *title);
void SLK_core_set_fullscreen(int fullscreen);
void SLK_core_set_icon(const SLK_RGB_sprite *icon);
void SLK_update();
void SLK_update_viewport();
void SLK_update_mouse(int x, int y);
int SLK_running();
void SLK_quit();
int SLK_core_running();
void SLK_core_quit();
#endif //_SLK_FUNCTIONS_H_

90
src/SLK/SLK_core.c
View file

@ -13,20 +13,44 @@ Redistribution and use in source and binary forms, with or without modification,
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "../../include/SLK/SLK.h"
#include "SLK_variables.h"
//External includes
//-------------------------------------
void SLK_quit()
//Internal includes
#include "../../include/SLK/SLK_types.h"
#include "../../include/SLK/SLK_functions.h"
#include "SLK_variables.h"
//-------------------------------------
//#defines
//-------------------------------------
//Typedefs
//-------------------------------------
//Variables
//-------------------------------------
//Function prototypes
//-------------------------------------
//Function implementations
//Sets the running flag to 0.
void SLK_core_quit()
{
running = 0;
}
int SLK_running()
//Checks wether SoftLK is supposed to be running or not.
int SLK_core_running()
{
return running;
}
//Sets the title of the window.
//I did not test this since I am using
//a window manager without titlebars.
void SLK_core_set_title(const char *title)
{
SDL_SetWindowTitle(sdl_window,title);
@ -45,9 +69,12 @@ void SLK_core_set_fullscreen(int fullscreen)
}
SDL_GetWindowSize(sdl_window,&window_width,&window_height);
SLK_update_viewport();
SLK_render_update_viewport();
}
//Sets the icon of the window.
//I did not test this since I am using
//a window manager without titlebars.
void SLK_core_set_icon(const SLK_RGB_sprite *icon)
{
SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(icon->data,icon->width,icon->height,32,icon->width*4,0xf000,0x0f00,0x00f0,0x000f);
@ -57,6 +84,8 @@ void SLK_core_set_icon(const SLK_RGB_sprite *icon)
SDL_FreeSurface(surface);
}
//Updates the engine state.
//Updates the input and the timer.
void SLK_update()
{
SLK_timer_update();
@ -71,7 +100,7 @@ void SLK_update()
running = 0;
break;
case SDL_MOUSEMOTION:
SLK_update_mouse(event.motion.x,event.motion.y);
SLK_mouse_update(event.motion.x,event.motion.y);
break;
case SDL_KEYDOWN:
if(text_input_active&&event.key.keysym.sym==SDLK_BACKSPACE&&text_input[0]!='\0')
@ -145,47 +174,9 @@ void SLK_update()
}
}
void SLK_update_viewport()
{
view_width = screen_width*pixel_scale;
view_height = screen_height*pixel_scale;
if(view_height<window_height)
{
int p_scale = window_height/screen_height;
view_width = screen_width*p_scale;
view_height = screen_height*p_scale;
}
else
{
int p_scale = window_width/screen_width;
view_width = screen_width*p_scale;
view_height = screen_height*p_scale;
}
view_x = (window_width-view_width)/2;
view_y = (window_height-view_height)/2;
}
void SLK_update_mouse(int x, int y)
{
x-=view_x;
y-=view_y;
mouse_x_cache = (int)(((float)x/(float)(window_width-(view_x*2))*(float)screen_width));
mouse_y_cache = (int)(((float)y/(float)(window_height-(view_y*2))*(float)screen_height));
if(mouse_x_cache>=screen_width)
mouse_x_cache = screen_width-1;
if(mouse_y_cache>=screen_height)
mouse_y_cache = screen_height-1;
if(mouse_x_cache<0)
mouse_x_cache = 0;
if(mouse_y_cache<1)
mouse_y_cache = 1;
}
//The first function you should call in your code.
//Creates a window, sets its title and allocates space for the layers.
//Also loads the font files in the data dir if availible.
void SLK_setup(const int width, const int height, const int layer_num, const char *title, const int fullscreen, int scale)
{
pixel_scale = scale;
@ -249,7 +240,7 @@ void SLK_setup(const int width, const int height, const int layer_num, const cha
SDL_GL_SetSwapInterval(0);
SDL_GetWindowSize(sdl_window,&window_width,&window_height);
SLK_update_viewport();
SLK_render_update_viewport();
SLK_render_init();
text_sprite_pal = SLK_pal_sprite_load("data/font8x8.slk");
@ -353,3 +344,4 @@ void SLK_setup(const int width, const int height, const int layer_num, const cha
memset(new_key_state,0,sizeof(new_key_state));
memset(new_mouse_state,0,sizeof(new_mouse_state));
}
//-------------------------------------

22
src/SLK/SLK_input.c
View file

@ -89,6 +89,28 @@ void SLK_mouse_get_pos(int *x, int *y)
*y = mouse_y_cache;
}
//Updates the mouse position (only the variable,
//not the actual position).
//Used in SLK_update, no need to call yourself.
void SLK_mouse_update(int x, int y)
{
x-=view_x;
y-=view_y;
mouse_x_cache = (int)(((float)x/(float)(window_width-(view_x*2))*(float)screen_width));
mouse_y_cache = (int)(((float)y/(float)(window_height-(view_y*2))*(float)screen_height));
if(mouse_x_cache>=screen_width)
mouse_x_cache = screen_width-1;
if(mouse_y_cache>=screen_height)
mouse_y_cache = screen_height-1;
if(mouse_x_cache<0)
mouse_x_cache = 0;
if(mouse_y_cache<1)
mouse_y_cache = 1;
}
//Sets wether the cursor should be shown.
void SLK_mouse_show_cursor(int shown)
{

37
src/SLK/SLK_layer.c
View file

@ -13,9 +13,35 @@ Redistribution and use in source and binary forms, with or without modification,
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "../../include/SLK/SLK.h"
#include "SLK_variables.h"
//External includes
#include <SDL2/SDL.h>
#include "../../include/glad/glad.h"
//-------------------------------------
//Internal includes
#include "../../include/SLK/SLK_types.h"
#include "../../include/SLK/SLK_functions.h"
#include "SLK_variables.h"
//-------------------------------------
//#defines
//-------------------------------------
//Typedefs
//-------------------------------------
//Variables
//-------------------------------------
//Function prototypes
//-------------------------------------
//Function implementations
//Initializes the requested layer to the specified type.
//These types are currently availible:
//SLK_LAYER_RGB,
//SLK_LAYER_PAL
void SLK_layer_create(const unsigned index, const int type)
{
if(index>=layer_count)
@ -59,6 +85,7 @@ void SLK_layer_create(const unsigned index, const int type)
}
}
//Sets wether the layers is supposed to be drawn.
void SLK_layer_activate(const unsigned index, const int active)
{
if(index>=layer_count)
@ -67,6 +94,8 @@ void SLK_layer_activate(const unsigned index, const int active)
layers[index].active = active;
}
//Sets the palette of a layer.
//Only works for SLK_LAYER_PAL layer type.
void SLK_layer_set_palette(const unsigned index, SLK_Palette *pal)
{
if(index>=layer_count||layers[index].type!=SLK_LAYER_PAL)
@ -75,11 +104,14 @@ void SLK_layer_set_palette(const unsigned index, SLK_Palette *pal)
layers[index].type_0.palette = pal;
}
//Sets the tint a layers is supposed to be drawn with.
void SLK_layer_set_tint(unsigned index, SLK_Color tint)
{
layers[index].tint = tint;
}
//Sets wich layer is the current default draw target.
//Also overwrites the current draw target.
void SLK_layer_set_current(const unsigned index)
{
if(index>=layer_count)
@ -98,3 +130,4 @@ void SLK_layer_set_current(const unsigned index)
target_rgb = layers[index].type_1.target;
}
}
//-------------------------------------

24
src/SLK/SLK_render.c
View file

@ -113,4 +113,28 @@ void SLK_render_update()
SDL_GL_SwapWindow(sdl_window);
}
//Updates the viewport (the space where everything is drawn in)
//using the current window width and screen width.
void SLK_render_update_viewport()
{
view_width = screen_width*pixel_scale;
view_height = screen_height*pixel_scale;
if(view_height<window_height)
{
int p_scale = window_height/screen_height;
view_width = screen_width*p_scale;
view_height = screen_height*p_scale;
}
else
{
int p_scale = window_width/screen_width;
view_width = screen_width*p_scale;
view_height = screen_height*p_scale;
}
view_x = (window_width-view_width)/2;
view_y = (window_height-view_height)/2;
}
//-------------------------------------