Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Fix generation errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThisDevDane
ThisDevDane committed Jul 7, 2020
1 parent 787e382 commit b95f14c
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 47 deletions.
2 changes: 1 addition & 1 deletion examples/sdl_opengl/main.odin
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ main :: proc() {
return true;
}

imgui.combo_fn_ptr("combo fn ptr", &curr_3, item_getter, &items, i32(len(items)));
imgui.combo_fn_bool_ptr("combo fn ptr", &curr_3, item_getter, &items, i32(len(items)));

imgui.end();
}
Expand Down
Binary file modified external/cimgui.lib
View file
Binary file not shown.
Binary file modified external/cimgui_debug.lib
View file
Binary file not shown.
Binary file modified external/cimgui_debug.pdb
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions foreign.odin
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ foreign cimgui {
igColumns :: proc(count: i32, id: cstring, border: bool) ---;
igComboStr_arr :: proc(label: cstring, current_item: ^i32, items: ^cstring, items_count: i32, popup_max_height_in_items: i32) -> bool ---
igComboStr :: proc(label: cstring, current_item: ^i32, items_separated_by_zeros: cstring, popup_max_height_in_items: i32) -> bool ---;
igComboFnBoolPtr :: proc(label: cstring, current_item: ^i32, items_getter: ^^^^bool(, data: rawptr, items_count: i32, popup_max_height_in_items: i32) -> bool ---;
igComboFnBoolPtr :: proc(label: cstring, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, popup_max_height_in_items: i32) -> bool ---
igCreateContext :: proc(shared_font_atlas: ^Font_Atlas) -> ^Context ---;
igCreateNewWindowSettings :: proc(name: cstring) -> ^Window_Settings ---;
igDataTypeApplyOp :: proc(data_type: Data_Type, op: i32, output: rawptr, arg_1: rawptr, arg_2: rawptr) ---;
Expand Down Expand Up @@ -627,7 +627,7 @@ foreign cimgui {
igKeepAliveID :: proc(id: ImID) ---;
igLabelText :: proc(label: cstring, fmt_: cstring, #c_vararg args: ..any) ---;
igListBoxStr_arr :: proc(label: cstring, current_item: ^i32, items: cstring, items_count: i32, height_in_items: i32) -> bool ---;
igListBoxFnBoolPtr :: proc(label: cstring, current_item: ^i32, items_getter: ^^^^bool(, data: rawptr, items_count: i32, height_in_items: i32) -> bool ---;
igListBoxFnBoolPtr :: proc(label: cstring, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, height_in_items: i32) -> bool ---
igListBoxFooter :: proc() ---;
igListBoxHeaderVec2 :: proc(label: cstring, size: Vec2) -> bool ---;
igListBoxHeaderInt :: proc(label: cstring, items_count: i32, height_in_items: i32) -> bool ---;
Expand Down Expand Up @@ -662,9 +662,9 @@ foreign cimgui {
igOpenPopupEx :: proc(id: ImID, popup_flags: Popup_Flags) ---;
igPlotEx :: proc(plot_type: Plot_Type, label: cstring, values_getter: Value_Getter_Proc, data: rawptr, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, frame_size: Vec2) -> i32 ---
igPlotHistogramFloatPtr :: proc(label: cstring, values: ^f32, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, graph_size: Vec2, stride: i32) ---;
igPlotHistogramFnFloatPtr :: proc(label: cstring, values_getter: ^^float(, data: rawptr, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, graph_size: Vec2) ---;
igPlotHistogramFnFloatPtr :: proc(label: cstring, values_getter: Value_Getter_Proc, data: rawptr, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, graph_size: Vec2) ---
igPlotLinesFloatPtr :: proc(label: cstring, values: ^f32, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, graph_size: Vec2, stride: i32) ---;
igPlotLinesFnFloatPtr :: proc(label: cstring, values_getter: ^^float(, data: rawptr, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, graph_size: Vec2) ---;
igPlotLinesFnFloatPtr :: proc(label: cstring, values_getter: Value_Getter_Proc, data: rawptr, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, graph_size: Vec2) ---
igPopAllowKeyboardFocus :: proc() ---;
igPopButtonRepeat :: proc() ---;
igPopClipRect :: proc() ---;
Expand Down
40 changes: 20 additions & 20 deletions generator_v2/predefined/imgui_predefined.odin
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ Storage_Pair :: struct {
igSetAllocatorFunctions :: proc(alloc_func: Alloc_Func, free_func: Free_Func) ---;
@(foreign_overwrite="igPlotEx")
igPlotEx :: proc(plot_type: Plot_Type, label: cstring, values_getter: Value_Getter_Proc, data: rawptr, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, frame_size: Vec2) -> i32 ---;
@(foreign_overwrite="igPlotHistogramFnPtr")
igPlotHistogramFnPtr :: proc(label: cstring, values_getter: Value_Getter_Proc, data: rawptr, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, graph_size: Vec2) ---;
@(foreign_overwrite="igPlotLinesFnPtr")
igPlotLinesFnPtr :: proc(label: cstring, values_getter: Value_Getter_Proc, data: rawptr, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, graph_size: Vec2) ---;
@(foreign_overwrite="igListBoxFnPtr")
igListBoxFnPtr :: proc(label: cstring, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, height_in_items: i32) -> bool ---;
@(foreign_overwrite="igComboFnPtr")
igComboFnPtr :: proc(label: cstring, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, popup_max_height_in_items: i32) -> bool ---;
@(foreign_overwrite="igPlotHistogramFnFloatPtr")
igPlotHistogramFnFloatPtr :: proc(label: cstring, values_getter: Value_Getter_Proc, data: rawptr, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, graph_size: Vec2) ---;
@(foreign_overwrite="igPlotLinesFnFloatPtr")
igPlotLinesFnFloatPtr :: proc(label: cstring, values_getter: Value_Getter_Proc, data: rawptr, values_count: i32, values_offset: i32, overlay_text: cstring, scale_min: f32, scale_max: f32, graph_size: Vec2) ---;
@(foreign_overwrite="igListBoxFnBoolPtr")
igListBoxFnBoolPtr :: proc(label: cstring, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, height_in_items: i32) -> bool ---;
@(foreign_overwrite="igComboFnBoolPtr")
igComboFnBoolPtr :: proc(label: cstring, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, popup_max_height_in_items: i32) -> bool ---;
@(foreign_overwrite="igComboStr_arr")
igComboStr_arr :: proc(label: cstring, current_item: ^i32, items: ^cstring, items_count: i32, popup_max_height_in_items: i32) -> bool ---;

Expand Down Expand Up @@ -166,8 +166,8 @@ wrapper_plot_ex :: proc(plot_type: Plot_Type,
return igPlotEx(plot_type, l, values_getter, data, values_count, values_offset, overlay, scale_min, scale_max, frame_size);
}

@(wrapper="igPlotHistogramFnPtr")
wrapper_plot_histogram_fn_ptr :: proc(label: string,
@(wrapper="igPlotHistogramFnFloatPtr")
wrapper_plot_histogram_fn_float_ptr :: proc(label: string,
values_getter: Value_Getter_Proc,
data: rawptr,
values_count: i32,
Expand All @@ -178,11 +178,11 @@ wrapper_plot_histogram_fn_ptr :: proc(label: string,
graph_size: Vec2) {
l := strings.clone_to_cstring(label, context.temp_allocator);
overlay := strings.clone_to_cstring(overlay_text, context.temp_allocator);
igPlotHistogramFnPtr(l, values_getter, data, values_count, values_offset, overlay, scale_min, scale_max, graph_size);
igPlotHistogramFnFloatPtr(l, values_getter, data, values_count, values_offset, overlay, scale_min, scale_max, graph_size);
}

@(wrapper="igPlotLinesFnPtr")
wrapper_plot_lines_fn_ptr :: proc(label: string,
@(wrapper="igPlotLinesFnFloatPtr")
wrapper_plot_lines_fn_float_ptr :: proc(label: string,
values_getter: Value_Getter_Proc,
data: rawptr,
values_count: i32,
Expand All @@ -193,19 +193,19 @@ wrapper_plot_lines_fn_ptr :: proc(label: string,
graph_size: Vec2) {
l := strings.clone_to_cstring(label, context.temp_allocator);
overlay := strings.clone_to_cstring(overlay_text, context.temp_allocator);
igPlotLinesFnPtr(l, values_getter, data, values_count, values_offset, overlay, scale_min, scale_max, graph_size);
igPlotLinesFnFloatPtr(l, values_getter, data, values_count, values_offset, overlay, scale_min, scale_max, graph_size);
}

@(wrapper="igListBoxFnPtr")
wrapper_list_box_fn_ptr :: proc(label: string, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, height_in_items := i32(0))-> bool {
@(wrapper="igListBoxFnBoolPtr")
wrapper_list_box_fn_bool_ptr :: proc(label: string, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, height_in_items := i32(0))-> bool {
l := strings.clone_to_cstring(label, context.temp_allocator);
return igListBoxFnPtr(l, current_item, items_getter, data, items_count, height_in_items);
return igListBoxFnBoolPtr(l, current_item, items_getter, data, items_count, height_in_items);
}

@(wrapper="igComboFnPtr")
wrapper_combo_fn_ptr :: proc(label: string, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, popup_max_height_in_items := i32(0)) -> bool {
@(wrapper="igComboFnBoolPtr")
wrapper_combo_fn_bool_ptr :: proc(label: string, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, popup_max_height_in_items := i32(0)) -> bool {
l := strings.clone_to_cstring(label, context.temp_allocator);
return igComboFnPtr(l, current_item, items_getter, data, items_count, popup_max_height_in_items);
return igComboFnBoolPtr(l, current_item, items_getter, data, items_count, popup_max_height_in_items);
}

@(wrapper="igComboStr_arr")
Expand Down
8 changes: 4 additions & 4 deletions header.odin
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ combo :: proc {
};
combo_str_arr :: inline proc(label: string, current_item: ^i32, items: []string, popup_max_height_in_items := i32(0)) -> bool do return wrapper_combo_str_arr(label, current_item, items, popup_max_height_in_items);
combo_str :: inline proc(label: string, current_item: ^i32, items_separated_by_zeros: string, popup_max_height_in_items := i32(-1)) -> bool do return swr_igComboStr(label, current_item, items_separated_by_zeros, popup_max_height_in_items);
combo_fn_bool_ptr :: inline proc(label: string, current_item: ^i32, items_getter: ^^^^bool(, data: rawptr, items_count: i32, popup_max_height_in_items := i32(-1)) -> bool do return swr_igComboFnBoolPtr(label, current_item, items_getter, data, items_count, popup_max_height_in_items);
combo_fn_bool_ptr :: inline proc(label: string, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, popup_max_height_in_items := i32(0)) -> bool do return wrapper_combo_fn_bool_ptr(label, current_item, items_getter, data, items_count, popup_max_height_in_items);

create_context :: inline proc(shared_font_atlas : ^Font_Atlas = nil) -> ^Context do return igCreateContext(shared_font_atlas);
create_new_window_settings :: inline proc(name: string) -> ^Window_Settings do return swr_igCreateNewWindowSettings(name);
Expand Down Expand Up @@ -731,7 +731,7 @@ list_box :: proc {
list_box_fn_bool_ptr,
};
list_box_str_arr :: inline proc(label: string, current_item: ^i32, items: string, items_count: i32, height_in_items := i32(-1)) -> bool do return swr_igListBoxStr_arr(label, current_item, items, items_count, height_in_items);
list_box_fn_bool_ptr :: inline proc(label: string, current_item: ^i32, items_getter: ^^^^bool(, data: rawptr, items_count: i32, height_in_items := i32(-1)) -> bool do return swr_igListBoxFnBoolPtr(label, current_item, items_getter, data, items_count, height_in_items);
list_box_fn_bool_ptr :: inline proc(label: string, current_item: ^i32, items_getter: Items_Getter_Proc, data: rawptr, items_count: i32, height_in_items := i32(0)) -> bool do return wrapper_list_box_fn_bool_ptr(label, current_item, items_getter, data, items_count, height_in_items);

list_box_footer :: inline proc() do igListBoxFooter();

Expand Down Expand Up @@ -790,15 +790,15 @@ plot_histogram :: proc {
plot_histogram_fn_float_ptr,
};
plot_histogram_float_ptr :: inline proc(label: string, values: ^f32, values_count: i32, values_offset := i32(0), overlay_text := "", scale_min := f32(max(f32)), scale_max := f32(max(f32)), graph_size := Vec2(Vec2 {0,0}), stride := i32(size_of(f32))) do swr_igPlotHistogramFloatPtr(label, values, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size, stride);
plot_histogram_fn_float_ptr :: inline proc(label: string, values_getter: ^^float(, data: rawptr, values_count: i32, values_offset := i32(0), overlay_text := "", scale_min := f32(max(f32)), scale_max := f32(max(f32)), graph_size := Vec2(Vec2 {0,0})) do swr_igPlotHistogramFnFloatPtr(label, values_getter, data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
plot_histogram_fn_float_ptr :: inline proc(label: string, values_getter: Value_Getter_Proc, data: rawptr, values_count: i32, values_offset: i32, overlay_text: string, scale_min: f32, scale_max: f32, graph_size: Vec2) do wrapper_plot_histogram_fn_float_ptr(label, values_getter, data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);


plot_lines :: proc {
plot_lines_float_ptr,
plot_lines_fn_float_ptr,
};
plot_lines_float_ptr :: inline proc(label: string, values: ^f32, values_count: i32, values_offset := i32(0), overlay_text := "", scale_min := f32(max(f32)), scale_max := f32(max(f32)), graph_size := Vec2(Vec2 {0,0}), stride := i32(size_of(f32))) do swr_igPlotLinesFloatPtr(label, values, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size, stride);
plot_lines_fn_float_ptr :: inline proc(label: string, values_getter: ^^float(, data: rawptr, values_count: i32, values_offset := i32(0), overlay_text := "", scale_min := f32(max(f32)), scale_max := f32(max(f32)), graph_size := Vec2(Vec2 {0,0})) do swr_igPlotLinesFnFloatPtr(label, values_getter, data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);
plot_lines_fn_float_ptr :: inline proc(label: string, values_getter: Value_Getter_Proc, data: rawptr, values_count: i32, values_offset: i32, overlay_text: string, scale_min: f32, scale_max: f32, graph_size: Vec2) do wrapper_plot_lines_fn_float_ptr(label, values_getter, data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size);

pop_allow_keyboard_focus :: inline proc() do igPopAllowKeyboardFocus();
pop_button_repeat :: inline proc() do igPopButtonRepeat();
Expand Down
Loading

0 comments on commit b95f14c

Please sign in to comment.