Rebuild nuklear.h

This commit is contained in:
PROP 65 2024-08-19 01:13:57 +00:00 committed by GitHub
parent 8306b32465
commit 97fb6fffd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 385 additions and 3 deletions

388
nuklear.h
View File

@ -3261,6 +3261,15 @@ NK_API float nk_slide_float(struct nk_context*, float min, float val, float max,
NK_API int nk_slide_int(struct nk_context*, int min, int val, int max, int step); NK_API int nk_slide_int(struct nk_context*, int min, int val, int max, int step);
NK_API nk_bool nk_slider_float(struct nk_context*, float min, float *val, float max, float step); NK_API nk_bool nk_slider_float(struct nk_context*, float min, float *val, float max, float step);
NK_API nk_bool nk_slider_int(struct nk_context*, int min, int *val, int max, int step); NK_API nk_bool nk_slider_int(struct nk_context*, int min, int *val, int max, int step);
/* =============================================================================
*
* KNOB
*
* ============================================================================= */
NK_API nk_bool nk_knob_float(struct nk_context*, float min, float *val, float max, float step, enum nk_heading zero_direction, float dead_zone_degrees);
NK_API nk_bool nk_knob_int(struct nk_context*, int min, int *val, int max, int step, enum nk_heading zero_direction, float dead_zone_degrees);
/* ============================================================================= /* =============================================================================
* *
* PROGRESSBAR * PROGRESSBAR
@ -3667,6 +3676,10 @@ enum nk_style_colors {
NK_COLOR_SCROLLBAR_CURSOR_HOVER, NK_COLOR_SCROLLBAR_CURSOR_HOVER,
NK_COLOR_SCROLLBAR_CURSOR_ACTIVE, NK_COLOR_SCROLLBAR_CURSOR_ACTIVE,
NK_COLOR_TAB_HEADER, NK_COLOR_TAB_HEADER,
NK_COLOR_KNOB,
NK_COLOR_KNOB_CURSOR,
NK_COLOR_KNOB_CURSOR_HOVER,
NK_COLOR_KNOB_CURSOR_ACTIVE,
NK_COLOR_COUNT NK_COLOR_COUNT
}; };
enum nk_style_cursor { enum nk_style_cursor {
@ -5079,6 +5092,39 @@ struct nk_style_slider {
void(*draw_end)(struct nk_command_buffer*, nk_handle); void(*draw_end)(struct nk_command_buffer*, nk_handle);
}; };
struct nk_style_knob {
/* background */
struct nk_style_item normal;
struct nk_style_item hover;
struct nk_style_item active;
struct nk_color border_color;
/* knob */
struct nk_color knob_normal;
struct nk_color knob_hover;
struct nk_color knob_active;
struct nk_color knob_border_color;
/* cursor */
struct nk_color cursor_normal;
struct nk_color cursor_hover;
struct nk_color cursor_active;
/* properties */
float border;
float knob_border;
struct nk_vec2 padding;
struct nk_vec2 spacing;
float cursor_width;
float color_factor;
float disabled_factor;
/* optional user callbacks */
nk_handle userdata;
void(*draw_begin)(struct nk_command_buffer*, nk_handle);
void(*draw_end)(struct nk_command_buffer*, nk_handle);
};
struct nk_style_progress { struct nk_style_progress {
/* background */ /* background */
struct nk_style_item normal; struct nk_style_item normal;
@ -5365,6 +5411,7 @@ struct nk_style {
struct nk_style_toggle checkbox; struct nk_style_toggle checkbox;
struct nk_style_selectable selectable; struct nk_style_selectable selectable;
struct nk_style_slider slider; struct nk_style_slider slider;
struct nk_style_knob knob;
struct nk_style_progress progress; struct nk_style_progress progress;
struct nk_style_property property; struct nk_style_property property;
struct nk_style_edit edit; struct nk_style_edit edit;
@ -5756,6 +5803,7 @@ struct nk_context {
* MATH * MATH
* =============================================================== */ * =============================================================== */
#define NK_PI 3.141592654f #define NK_PI 3.141592654f
#define NK_PI_HALF 1.570796326f
#define NK_UTF_INVALID 0xFFFD #define NK_UTF_INVALID 0xFFFD
#define NK_MAX_FLOAT_PRECISION 2 #define NK_MAX_FLOAT_PRECISION 2
@ -5939,6 +5987,12 @@ NK_LIB float nk_sin(float x);
#ifndef NK_COS #ifndef NK_COS
NK_LIB float nk_cos(float x); NK_LIB float nk_cos(float x);
#endif #endif
#ifndef NK_ATAN
NK_LIB float nk_atan(float x);
#endif
#ifndef NK_ATAN2
NK_LIB float nk_atan2(float y, float x);
#endif
NK_LIB nk_uint nk_round_up_pow2(nk_uint v); NK_LIB nk_uint nk_round_up_pow2(nk_uint v);
NK_LIB struct nk_rect nk_shrink_rect(struct nk_rect r, float amount); NK_LIB struct nk_rect nk_shrink_rect(struct nk_rect r, float amount);
NK_LIB struct nk_rect nk_pad_rect(struct nk_rect r, struct nk_vec2 pad); NK_LIB struct nk_rect nk_pad_rect(struct nk_rect r, struct nk_vec2 pad);
@ -6292,6 +6346,52 @@ nk_cos(float x)
return a0 + x*(a1 + x*(a2 + x*(a3 + x*(a4 + x*(a5 + x*(a6 + x*(a7 + x*a8))))))); return a0 + x*(a1 + x*(a2 + x*(a3 + x*(a4 + x*(a5 + x*(a6 + x*(a7 + x*a8)))))));
} }
#endif #endif
#ifndef NK_ATAN
#define NK_ATAN nk_atan
NK_LIB float
nk_atan(float x)
{
/* ./lolremez --progress --float -d 9 -r "0:pi*2" "atan(x)" */
float u = -1.0989005e-05f;
NK_ASSERT(x >= 0.0f && "TODO support negative floats");
u = u * x + 0.00034117949f;
u = u * x + -0.0044932296f;
u = u * x + 0.032596264f;
u = u * x + -0.14088021f;
u = u * x + 0.36040401f;
u = u * x + -0.47017866f;
u = u * x + 0.00050198776f;
u = u * x + 1.0077682f;
u = u * x + -0.0004765437f;
return u;
}
#endif
#ifndef NK_ATAN2
#define NK_ATAN2 nk_atan2
NK_LIB float
nk_atan2(float y, float x)
{
float ax = NK_ABS(x),
ay = NK_ABS(y);
/* 0 = +y +x 1 = -y +x
2 = +y -x 3 = -y -x */
nk_uint signs = (y < 0) | ((x < 0) << 1);
float a;
if(y == 0.0 && x == 0.0) return 0.0f;
a = (ay > ax)
? NK_PI_HALF - NK_ATAN(ax / ay)
: NK_ATAN(ay / ax);
switch(signs){
case 0: return a;
case 1: return -a;
case 2: return -a + NK_PI;
case 3: return a - NK_PI;
}
return 0.0f; /* prevents warning */
}
#endif
NK_LIB nk_uint NK_LIB nk_uint
nk_round_up_pow2(nk_uint v) nk_round_up_pow2(nk_uint v)
{ {
@ -18219,13 +18319,13 @@ NK_API void nk_style_default(struct nk_context *ctx){nk_style_from_table(ctx, 0)
NK_COLOR(NK_COLOR_TOGGLE_HOVER, 120,120,120,255) \ NK_COLOR(NK_COLOR_TOGGLE_HOVER, 120,120,120,255) \
NK_COLOR(NK_COLOR_TOGGLE_CURSOR, 45, 45, 45, 255) \ NK_COLOR(NK_COLOR_TOGGLE_CURSOR, 45, 45, 45, 255) \
NK_COLOR(NK_COLOR_SELECT, 45, 45, 45, 255) \ NK_COLOR(NK_COLOR_SELECT, 45, 45, 45, 255) \
NK_COLOR(NK_COLOR_SELECT_ACTIVE, 35, 35, 35,255) \ NK_COLOR(NK_COLOR_SELECT_ACTIVE, 35, 35, 35,255) \
NK_COLOR(NK_COLOR_SLIDER, 38, 38, 38, 255) \ NK_COLOR(NK_COLOR_SLIDER, 38, 38, 38, 255) \
NK_COLOR(NK_COLOR_SLIDER_CURSOR, 100,100,100,255) \ NK_COLOR(NK_COLOR_SLIDER_CURSOR, 100,100,100,255) \
NK_COLOR(NK_COLOR_SLIDER_CURSOR_HOVER, 120,120,120,255) \ NK_COLOR(NK_COLOR_SLIDER_CURSOR_HOVER, 120,120,120,255) \
NK_COLOR(NK_COLOR_SLIDER_CURSOR_ACTIVE, 150,150,150,255) \ NK_COLOR(NK_COLOR_SLIDER_CURSOR_ACTIVE, 150,150,150,255) \
NK_COLOR(NK_COLOR_PROPERTY, 38, 38, 38, 255) \ NK_COLOR(NK_COLOR_PROPERTY, 38, 38, 38, 255) \
NK_COLOR(NK_COLOR_EDIT, 38, 38, 38, 255) \ NK_COLOR(NK_COLOR_EDIT, 38, 38, 38, 255) \
NK_COLOR(NK_COLOR_EDIT_CURSOR, 175,175,175,255) \ NK_COLOR(NK_COLOR_EDIT_CURSOR, 175,175,175,255) \
NK_COLOR(NK_COLOR_COMBO, 45, 45, 45, 255) \ NK_COLOR(NK_COLOR_COMBO, 45, 45, 45, 255) \
NK_COLOR(NK_COLOR_CHART, 120,120,120,255) \ NK_COLOR(NK_COLOR_CHART, 120,120,120,255) \
@ -18235,7 +18335,11 @@ NK_API void nk_style_default(struct nk_context *ctx){nk_style_from_table(ctx, 0)
NK_COLOR(NK_COLOR_SCROLLBAR_CURSOR, 100,100,100,255) \ NK_COLOR(NK_COLOR_SCROLLBAR_CURSOR, 100,100,100,255) \
NK_COLOR(NK_COLOR_SCROLLBAR_CURSOR_HOVER, 120,120,120,255) \ NK_COLOR(NK_COLOR_SCROLLBAR_CURSOR_HOVER, 120,120,120,255) \
NK_COLOR(NK_COLOR_SCROLLBAR_CURSOR_ACTIVE, 150,150,150,255) \ NK_COLOR(NK_COLOR_SCROLLBAR_CURSOR_ACTIVE, 150,150,150,255) \
NK_COLOR(NK_COLOR_TAB_HEADER, 40, 40, 40,255) NK_COLOR(NK_COLOR_TAB_HEADER, 40, 40, 40,255) \
NK_COLOR(NK_COLOR_KNOB, 38, 38, 38, 255) \
NK_COLOR(NK_COLOR_KNOB_CURSOR, 100,100,100,255) \
NK_COLOR(NK_COLOR_KNOB_CURSOR_HOVER, 120,120,120,255) \
NK_COLOR(NK_COLOR_KNOB_CURSOR_ACTIVE, 150,150,150,255)
NK_GLOBAL const struct nk_color NK_GLOBAL const struct nk_color
nk_default_color_style[NK_COLOR_COUNT] = { nk_default_color_style[NK_COLOR_COUNT] = {
@ -18295,6 +18399,7 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
struct nk_style_toggle *toggle; struct nk_style_toggle *toggle;
struct nk_style_selectable *select; struct nk_style_selectable *select;
struct nk_style_slider *slider; struct nk_style_slider *slider;
struct nk_style_knob *knob;
struct nk_style_progress *prog; struct nk_style_progress *prog;
struct nk_style_scrollbar *scroll; struct nk_style_scrollbar *scroll;
struct nk_style_edit *edit; struct nk_style_edit *edit;
@ -18503,6 +18608,32 @@ nk_style_from_table(struct nk_context *ctx, const struct nk_color *table)
button->draw_end = 0; button->draw_end = 0;
style->slider.dec_button = style->slider.inc_button; style->slider.dec_button = style->slider.inc_button;
/* knob */
knob = &style->knob;
nk_zero_struct(*knob);
knob->normal = nk_style_item_hide();
knob->hover = nk_style_item_hide();
knob->active = nk_style_item_hide();
knob->knob_normal = table[NK_COLOR_KNOB];
knob->knob_hover = table[NK_COLOR_KNOB];
knob->knob_active = table[NK_COLOR_KNOB];
knob->cursor_normal = table[NK_COLOR_KNOB_CURSOR];
knob->cursor_hover = table[NK_COLOR_KNOB_CURSOR_HOVER];
knob->cursor_active = table[NK_COLOR_KNOB_CURSOR_ACTIVE];
knob->knob_border_color = table[NK_COLOR_BORDER];
knob->knob_border = 1.0f;
knob->padding = nk_vec2(2,2);
knob->spacing = nk_vec2(2,2);
knob->cursor_width = 2;
knob->color_factor = 1.0f;
knob->disabled_factor = NK_WIDGET_DISABLED_FACTOR;
knob->userdata = nk_handle_ptr(0);
knob->draw_begin = 0;
knob->draw_end = 0;
/* progressbar */ /* progressbar */
prog = &style->progress; prog = &style->progress;
nk_zero_struct(*prog); nk_zero_struct(*prog);
@ -25762,6 +25893,257 @@ nk_slider_int(struct nk_context *ctx, int min, int *val, int max, int step)
/* ===============================================================
*
* KNOB
*
* ===============================================================*/
NK_LIB float
nk_knob_behavior(nk_flags *state, struct nk_input *in,
struct nk_rect bounds, float knob_min, float knob_max, float knob_value,
float knob_step, float knob_steps,
enum nk_heading zero_direction, float dead_zone_percent)
{
struct nk_vec2 origin;
float angle = 0.0f;
origin.x = bounds.x + (bounds.w / 2);
origin.y = bounds.y + (bounds.h / 2);
nk_widget_state_reset(state);
/* handle click and drag input */
if(in &&
in->mouse.buttons[NK_BUTTON_LEFT].down &&
nk_input_has_mouse_click_down_in_rect(in, NK_BUTTON_LEFT, bounds, nk_true)){
/* calculate angle from origin and rotate */
const float direction_rads[4] = {
NK_PI * 2.5f, /* 90 NK_UP */
NK_PI * 2.0f, /* 0 NK_RIGHT */
NK_PI * 1.5f, /* 270 NK_DOWN */
NK_PI, /* 180 NK_LEFT */
};
*state = NK_WIDGET_STATE_ACTIVE;
angle = NK_ATAN2(in->mouse.pos.y - origin.y, in->mouse.pos.x - origin.x) + direction_rads[zero_direction];
angle -= (angle > NK_PI * 2) ? NK_PI * 3 : NK_PI;
/* account for dead space applied when drawing */
angle *= 1.0f / (1.0f - dead_zone_percent);
angle = NK_CLAMP(-NK_PI, angle, NK_PI);
/* convert -pi -> pi range to 0.0 -> 1.0 */
angle = (angle + NK_PI) / (NK_PI * 2);
/* click to closest step */
knob_value = knob_min + ( (int)(angle * knob_steps + (knob_step / 2)) ) * knob_step;
knob_value = NK_CLAMP(knob_min, knob_value, knob_max);
}
/* knob widget state */
if (nk_input_is_mouse_hovering_rect(in, bounds)){
*state = NK_WIDGET_STATE_HOVERED;
if (in) {
/* handle scroll and arrow inputs */
if (in->mouse.scroll_delta.y > 0 ||
(in->keyboard.keys[NK_KEY_UP].down && in->keyboard.keys[NK_KEY_UP].clicked))
knob_value += knob_step;
if (in->mouse.scroll_delta.y < 0 ||
(in->keyboard.keys[NK_KEY_DOWN].down && in->keyboard.keys[NK_KEY_DOWN].clicked))
knob_value -= knob_step;
}
knob_value = NK_CLAMP(knob_min, knob_value, knob_max);
}
if (*state & NK_WIDGET_STATE_HOVER &&
!nk_input_is_mouse_prev_hovering_rect(in, bounds))
*state |= NK_WIDGET_STATE_ENTERED;
else if (nk_input_is_mouse_prev_hovering_rect(in, bounds))
*state |= NK_WIDGET_STATE_LEFT;
return knob_value;
}
NK_LIB void
nk_draw_knob(struct nk_command_buffer *out, nk_flags state,
const struct nk_style_knob *style, const struct nk_rect *bounds, float min, float value, float max,
enum nk_heading zero_direction, float dead_zone_percent)
{
const struct nk_style_item *background;
struct nk_color knob_color, cursor;
NK_UNUSED(min);
NK_UNUSED(max);
NK_UNUSED(value);
if (state & NK_WIDGET_STATE_ACTIVED) {
background = &style->active;
knob_color = style->knob_active;
cursor = style->cursor_active;
} else if (state & NK_WIDGET_STATE_HOVER) {
background = &style->hover;
knob_color = style->knob_hover;
cursor = style->cursor_hover;
} else {
background = &style->normal;
knob_color = style->knob_normal;
cursor = style->cursor_normal;
}
/* draw background */
switch(background->type) {
case NK_STYLE_ITEM_IMAGE:
nk_draw_image(out, *bounds, &background->data.image, nk_rgb_factor(nk_white, style->color_factor));
break;
case NK_STYLE_ITEM_NINE_SLICE:
nk_draw_nine_slice(out, *bounds, &background->data.slice, nk_rgb_factor(nk_white, style->color_factor));
break;
case NK_STYLE_ITEM_COLOR:
nk_fill_rect(out, *bounds, 0, nk_rgb_factor(background->data.color, style->color_factor));
nk_stroke_rect(out, *bounds, 0, style->border, nk_rgb_factor(style->border_color, style->color_factor));
break;
}
/* draw knob */
nk_fill_circle(out, *bounds, nk_rgb_factor(knob_color, style->color_factor));
if(style->knob_border > 0){
struct nk_rect border_bounds = *bounds;
border_bounds.x += style->knob_border / 2;
border_bounds.y += style->knob_border / 2;
border_bounds.w -= style->knob_border;
border_bounds.h -= style->knob_border;
nk_stroke_circle(out, border_bounds, style->knob_border, nk_rgb_factor(style->knob_border_color, style->color_factor));
}
{ /* calculate cursor line cords */
float half_circle_size = (bounds->w / 2);
float angle = (value - min) / (max - min);
float alive_zone = 1.0f - dead_zone_percent;
struct nk_vec2 cursor_start, cursor_end;
const float direction_rads[4] = {
NK_PI * 1.5f, /* 90 NK_UP */
0.0f, /* 0 NK_RIGHT */
NK_PI * 0.5f, /* 270 NK_DOWN */
NK_PI, /* 180 NK_LEFT */
};
/* calculate + apply dead zone */
angle = (angle * alive_zone) + (dead_zone_percent / 2);
/* percentage 0.0 -> 1.0 to radians, rads are 0.0 to (2*pi) NOT -pi to pi */
angle *= NK_PI * 2;
/* apply zero angle */
angle += direction_rads[zero_direction];
if(angle > NK_PI * 2)
angle -= NK_PI * 2;
cursor_start.x = bounds->x + half_circle_size + (angle > NK_PI);
cursor_start.y = bounds->y + half_circle_size + (angle < NK_PI_HALF || angle > (NK_PI * 1.5f));
cursor_end.x = cursor_start.x + (half_circle_size * NK_COS(angle));
cursor_end.y = cursor_start.y + (half_circle_size * NK_SIN(angle));
/* cut off half of the cursor */
cursor_start.x = (cursor_start.x + cursor_end.x) / 2;
cursor_start.y = (cursor_start.y + cursor_end.y) / 2;
/* draw cursor */
nk_stroke_line(out, cursor_start.x, cursor_start.y, cursor_end.x, cursor_end.y, 2, nk_rgb_factor(cursor, style->color_factor));
}
}
NK_LIB float
nk_do_knob(nk_flags *state,
struct nk_command_buffer *out, struct nk_rect bounds,
float min, float val, float max, float step,
enum nk_heading zero_direction, float dead_zone_percent,
const struct nk_style_knob *style, struct nk_input *in)
{
float knob_range;
float knob_min;
float knob_max;
float knob_value;
float knob_steps;
NK_ASSERT(style);
NK_ASSERT(out);
if (!out || !style)
return 0;
/* remove padding from knob bounds */
bounds.y = bounds.y + style->padding.y;
bounds.x = bounds.x + style->padding.x;
bounds.h = NK_MAX(bounds.h, 2*style->padding.y);
bounds.w = NK_MAX(bounds.w, 2*style->padding.x);
bounds.w -= 2 * style->padding.x;
bounds.h -= 2 * style->padding.y;
if(bounds.h < bounds.w){
bounds.x += (bounds.w - bounds.h) / 2;
bounds.w = bounds.h;
}
/* make sure the provided values are correct */
knob_max = NK_MAX(min, max);
knob_min = NK_MIN(min, max);
knob_value = NK_CLAMP(knob_min, val, knob_max);
knob_range = knob_max - knob_min;
knob_steps = knob_range / step;
knob_value = nk_knob_behavior(state, in, bounds, knob_min, knob_max, knob_value, step, knob_steps, zero_direction, dead_zone_percent);
/* draw knob */
if (style->draw_begin) style->draw_begin(out, style->userdata);
nk_draw_knob(out, *state, style, &bounds, knob_min, knob_value, knob_max, zero_direction, dead_zone_percent);
if (style->draw_end) style->draw_end(out, style->userdata);
return knob_value;
}
NK_API nk_bool
nk_knob_float(struct nk_context *ctx, float min_value, float *value, float max_value,
float value_step, enum nk_heading zero_direction, float dead_zone_degrees)
{
struct nk_window *win;
struct nk_panel *layout;
struct nk_input *in;
const struct nk_style *style;
int ret = 0;
float old_value;
struct nk_rect bounds;
enum nk_widget_layout_states state;
NK_ASSERT(ctx);
NK_ASSERT(ctx->current);
NK_ASSERT(ctx->current->layout);
NK_ASSERT(value);
NK_ASSERT(NK_BETWEEN(dead_zone_degrees, 0.0f, 360.0f));
if (!ctx || !ctx->current || !ctx->current->layout || !value)
return ret;
win = ctx->current;
style = &ctx->style;
layout = win->layout;
state = nk_widget(&bounds, ctx);
if (!state) return ret;
in = (state == NK_WIDGET_DISABLED || layout->flags & NK_WINDOW_ROM) ? 0 : &ctx->input;
old_value = *value;
*value = nk_do_knob(&ctx->last_widget_state, &win->buffer, bounds, min_value,
old_value, max_value, value_step, zero_direction, dead_zone_degrees / 360.0f, &style->knob, in);
return (old_value > *value || old_value < *value);
}
NK_API nk_bool
nk_knob_int(struct nk_context *ctx, int min, int *val, int max, int step,
enum nk_heading zero_direction, float dead_zone_degrees)
{
int ret;
float value = (float)*val;
ret = nk_knob_float(ctx, (float)min, &value, (float)max, (float)step, zero_direction, dead_zone_degrees);
*val = (int)value;
return ret;
}
/* =============================================================== /* ===============================================================
* *
* PROGRESS * PROGRESS