RK/rk_engine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: RK:ae3333e22e36667a0c02817fafb16ab7b8d1341b
Branches Tags
RK:master
..
compare: RK:beca8798bf91edba954d31eb4e1a619ec2140c83
Branches Tags
RK:master

2 Commits
ae3333e22e ... beca8798bf

Author SHA1 Message Date
Roz K
beca8798bf Rename create_shader. 2023-01-01 08:09:37 +01:00
Roz K
e80bbe2418 Remove begin_frame and end_frame, add clear_buffer. 2023-01-01 07:57:10 +01:00
3 changed files with 23 additions and 21 deletions
Expand all files Collapse all files

23
__init__.py
View File

@ -306,23 +306,23 @@ render_initialize.argtypes = (
render_terminate = _engine.rk_render_terminate render_terminate = _engine.rk_render_terminate
render_terminate.restype = None render_terminate.restype = None
_load_shader = _engine.rk_load_shader _create_shader = _engine.rk_create_shader
_load_shader.restype = _handle _create_shader.restype = _handle
_load_shader.errcheck = _check_handle _create_shader.errcheck = _check_handle
_load_shader.argtypes = ( _create_shader.argtypes = (
ctypes.c_uint, # vert_nlines ctypes.c_uint, # vert_nlines
ctypes.POINTER(ctypes.c_char_p), # vert_lines ctypes.POINTER(ctypes.c_char_p), # vert_lines
ctypes.c_uint, # frag_nlines ctypes.c_uint, # frag_nlines
ctypes.POINTER(ctypes.c_char_p)) # frag_lines ctypes.POINTER(ctypes.c_char_p)) # frag_lines
def load_shader(vert_lines, frag_lines): def create_shader(vert_lines, frag_lines):
vert_nlines = len(vert_lines) vert_nlines = len(vert_lines)
vert_type = ctypes.c_char_p * vert_nlines vert_type = ctypes.c_char_p * vert_nlines
vert_lines = vert_type(*map(ctypes.c_char_p, vert_lines)) vert_lines = vert_type(*map(ctypes.c_char_p, vert_lines))
frag_nlines = len(frag_lines) frag_nlines = len(frag_lines)
frag_type = ctypes.c_char_p * frag_nlines frag_type = ctypes.c_char_p * frag_nlines
frag_lines = frag_type(*map(ctypes.c_char_p, frag_lines)) frag_lines = frag_type(*map(ctypes.c_char_p, frag_lines))
return _load_shader(vert_nlines, vert_lines, frag_nlines, frag_lines) return _create_shader(vert_nlines, vert_lines, frag_nlines, frag_lines)
resolve_input = _engine.rk_resolve_input resolve_input = _engine.rk_resolve_input
resolve_input.restype = _handle resolve_input.restype = _handle
@ -385,8 +385,12 @@ create_batch.argtypes = (
ctypes.c_uint, # max_meshes ctypes.c_uint, # max_meshes
ctypes.c_char_p) # params_format ctypes.c_char_p) # params_format
begin_frame = _engine.rk_begin_frame clear_buffer = _engine.rk_clear_buffer
begin_frame.restype = None clear_buffer.restype = None
clear_buffer.argtypes = (
ctypes.c_bool, # pixels
ctypes.c_bool, # depth
ctypes.c_bool) # stencil
select_shader = _engine.rk_select_shader select_shader = _engine.rk_select_shader
select_shader.restype = None select_shader.restype = None
@ -460,9 +464,6 @@ unselect_shader.restype = None
unselect_shader.argtypes = ( unselect_shader.argtypes = (
ctypes.c_void_p,) # shader ctypes.c_void_p,) # shader
end_frame = _engine.rk_end_frame
end_frame.restype = None
destroy_batch = _engine.rk_destroy_batch destroy_batch = _engine.rk_destroy_batch
destroy_batch.restype = None destroy_batch.restype = None
destroy_batch.argtypes = ( destroy_batch.argtypes = (

9
cpp/render.hpp
View File

@ -85,7 +85,7 @@ RK_EXPORT void rk_render_initialize(
RK_EXPORT void rk_render_terminate(); RK_EXPORT void rk_render_terminate();
RK_EXPORT rk_shader_t rk_load_shader( RK_EXPORT rk_shader_t rk_create_shader(
rk_uint const vert_nlines, rk_uint const vert_nlines,
char const ** const vert_lines, char const ** const vert_lines,
rk_uint const frag_nlines, rk_uint const frag_nlines,
@ -124,7 +124,10 @@ RK_EXPORT rk_batch_t rk_create_batch(
rk_uint max_meshes, rk_uint max_meshes,
rk_param_format const * params_format); rk_param_format const * params_format);
RK_EXPORT void rk_begin_frame(); RK_EXPORT void rk_clear_buffer(
rk_bool pixels,
rk_bool depth,
rk_bool stencil);
RK_EXPORT void rk_select_shader( RK_EXPORT void rk_select_shader(
rk_shader_t _shader); rk_shader_t _shader);
@ -174,8 +177,6 @@ RK_EXPORT void rk_unselect_texture(
RK_EXPORT void rk_unselect_shader( RK_EXPORT void rk_unselect_shader(
rk_shader_t shader); rk_shader_t shader);
RK_EXPORT void rk_end_frame();
RK_EXPORT void rk_destroy_batch( RK_EXPORT void rk_destroy_batch(
rk_batch_t batch); rk_batch_t batch);

12
cpp/render/render_opengles.cpp
View File

@ -112,7 +112,7 @@ static void rk_print_program_infolog(GLuint program) {
} }
} }
rk_shader_t rk_load_shader( rk_shader_t rk_create_shader(
rk_uint const vert_nlines, rk_uint const vert_nlines,
char const ** const vert_lines, char const ** const vert_lines,
rk_uint const frag_nlines, rk_uint const frag_nlines,
@ -676,8 +676,11 @@ rk_batch_t rk_create_batch(
return reinterpret_cast<rk_batch_t>(batch); return reinterpret_cast<rk_batch_t>(batch);
} }
void rk_begin_frame() { void rk_clear_buffer(
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); rk_bool pixels,
rk_bool depth,
rk_bool stencil) {
glClear((GL_COLOR_BUFFER_BIT * pixels) | (GL_DEPTH_BUFFER_BIT * depth) | (GL_STENCIL_BUFFER_BIT * stencil));
} }
void rk_select_shader( void rk_select_shader(
@ -908,9 +911,6 @@ void rk_unselect_shader(
glUseProgram(0); glUseProgram(0);
} }
void rk_end_frame() {
}
void rk_destroy_batch( void rk_destroy_batch(
rk_batch_t _batch) { rk_batch_t _batch) {
rk_batch * const batch = reinterpret_cast<rk_batch *>(_batch); rk_batch * const batch = reinterpret_cast<rk_batch *>(_batch);