john/prosperon
1
0
Fork 0
Code Issues Pull requests Actions Releases Activity

add imgui text box; fix image blit

Browse source
This commit is contained in:
John Alanbrook 2024-08-31 00:38:26 -05:00
parent 1305a762e9
commit 794e581336
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/base.js
View file

@ -1258,7 +1258,7 @@ Object.defineProperty(Number.prototype, 'clamp', {
Math.clamp = vector.clamp;
Math.random_range = vector.random_range;
Math.rand_int = function(max) { return Math.floor(Math.random()*max); };
Math.rand_int = function(max = 9007199254740991) { return Math.floor(Math.random()*max); };
Math.snap = function(val, grid) {
if (!grid || grid === 1) return Math.round(val);

13
source/engine/gui.cpp
View file

@ -77,10 +77,15 @@ JSC_SSCALL(imgui_textinput,
ret = str2js(buffer);
)
JSC_SCALL(imgui_text,
ImGui::Text(str);
JSC_SSCALL(imgui_textbox,
char buffer[512];
strncpy(buffer, str2, 512);
ImGui::InputTextMultiline(str, buffer, sizeof(buffer));
ret = str2js(buffer);
)
JSC_SCALL(imgui_text, ImGui::Text(str) )
JSC_SCALL(imgui_button,
if (ImGui::Button(str))
script_call_sym(argv[1], 1, argv);
@ -137,6 +142,7 @@ JSC_CCALL(imgui_sameline, ImGui::SameLine() )
JSC_SCALL(imgui_columns, ImGui::Columns(js2number(argv[1]), str) )
JSC_CCALL(imgui_nextcolumn, ImGui::NextColumn() )
JSC_SCALL(imgui_collapsingheader, ret = boolean2js(ImGui::CollapsingHeader(str)) )
JSC_SCALL(imgui_radio, ret = boolean2js(ImGui::RadioButton(str, js2boolean(argv[1]))))
static const JSCFunctionListEntry js_imgui_funcs[] = {
MIST_FUNC_DEF(imgui, window, 2),
@ -148,9 +154,10 @@ static const JSCFunctionListEntry js_imgui_funcs[] = {
MIST_FUNC_DEF(imgui, menubar, 1),
MIST_FUNC_DEF(imgui, mainmenubar, 1),
MIST_FUNC_DEF(imgui, menuitem, 3),
// MIST_FUNC_DEF(imgui, radio,
MIST_FUNC_DEF(imgui, radio, 2),
MIST_FUNC_DEF(imgui, image, 1),
MIST_FUNC_DEF(imgui, textinput, 2),
MIST_FUNC_DEF(imgui, textbox, 2),
MIST_FUNC_DEF(imgui, button, 2),
MIST_FUNC_DEF(imgui, checkbox, 2),
MIST_FUNC_DEF(imgui, text, 1),

25
source/engine/texture.c
View file

@ -299,19 +299,14 @@ void texture_save(texture *tex, const char *file)
// sw the width of the destination to take in pixels
// sh the height of the destination to take in pixels
void blit_image(uint8_t* src, uint8_t* dest, int src_width, int src_height, int dest_width, int dest_height, int sx, int sy, int sw, int sh) {
if (sx + sw > dest_width) return;
if (sy + sh > dest_height) return;
if (sx < 0) return;
if (sy < 0) return;
int src_stride = src_width * 4;
int dest_stride = dest_width * 4;
int dest_pixels = dest_width*dest_height*4;
int src_pixels = src_width*src_height*4;
// if (sx + sw > dest_width) return;
// if (sy + sh > dest_height) return;
for (int y = 0; y < sw; y++) {
for (int x = 0; x < sh; x++) {
int src_index = (y * src_stride) + (x * 4);
int dest_index = ((y + sy) * dest_stride) + ((x + sx) * 4);
for (int x = 0; x < sw; x++) {
for (int y = 0; y < sh; y++) {
int src_index = ((y * src_width) + x ) * 4;
int dest_index = ((y + sy) * dest_width) + (x + sx);
dest_index *= 4;
// Calculate the alpha value for the source pixel
uint8_t src_alpha = src[src_index + 3];
@ -327,7 +322,6 @@ void blit_image(uint8_t* src, uint8_t* dest, int src_width, int src_height, int
uint8_t result_green = (src[src_index + 1] * src_alpha + dest[dest_index + 1] * (255 - src_alpha) * dest_alpha / 255) / result_alpha;
uint8_t result_blue = (src[src_index + 2] * src_alpha + dest[dest_index + 2] * (255 - src_alpha) * dest_alpha / 255) / result_alpha;
if (dest_index+3 > dest_pixels-3) return;
// Set the resulting pixel values
dest[dest_index + 0] = result_red;
dest[dest_index + 1] = result_green;
@ -338,10 +332,9 @@ void blit_image(uint8_t* src, uint8_t* dest, int src_width, int src_height, int
}
// Function to draw source image pixels on top of a destination image
// x,y are the pixel coordinates in the destination image, w,h are the amount of pixels to take from the src image.
void texture_blit(texture *dest, texture *src, int x, int y, int w, int h) {
if (x + w >= dest->width) return;
if (y + h >= dest->height) return;
blit_image(src->data, dest->data, src->width, src->height, dest->height, dest->width, x, y, w, h);
blit_image(src->data, dest->data, src->width, src->height, dest->width, dest->height, x, y, w, h);
}
void texture_flip(texture *tex, int y)