Update generated code

generated/clib/sk_clib.h

@@ -274,13 +274,16 @@ __sklib_point_2d __sklib__center_point__circle_ref(const __sklib_circle c);
 __sklib_circle __sklib__circle_at__point_2d_ref__double(const __sklib_point_2d pt, double radius);
 __sklib_circle __sklib__circle_at__double__double__double(double x, double y, double radius);
 float __sklib__circle_radius__circle(const __sklib_circle c);
+int __sklib__circle_triangle_intersect__circle_ref__triangle_ref(const __sklib_circle c, const __sklib_triangle tri);
+int __sklib__circle_triangle_intersect__circle_ref__triangle_ref__point_2d_ref(const __sklib_circle c, const __sklib_triangle tri, __sklib_point_2d *p);
 float __sklib__circle_x__circle_ref(const __sklib_circle c);
 float __sklib__circle_y__circle_ref(const __sklib_circle c);
 int __sklib__circles_intersect__circle__circle(__sklib_circle c1, __sklib_circle c2);
 int __sklib__circles_intersect__double__double__double__double__double__double(double c1_x, double c1_y, double c1_radius, double c2_x, double c2_y, double c2_radius);
 __sklib_point_2d __sklib__closest_point_on_circle__point_2d_ref__circle_ref(const __sklib_point_2d from_pt, const __sklib_circle c);
 __sklib_point_2d __sklib__closest_point_on_line_from_circle__circle_ref__line_ref(const __sklib_circle c, const __sklib_line l);
 __sklib_point_2d __sklib__closest_point_on_rect_from_circle__circle_ref__rectangle_ref(const __sklib_circle c, const __sklib_rectangle rect);
+__sklib_point_2d __sklib__closest_point_on_triangle_from_circle__circle_ref__triangle_ref(const __sklib_circle c, const __sklib_triangle tri);
 __sklib_point_2d __sklib__distant_point_on_circle__point_2d_ref__circle_ref(const __sklib_point_2d pt, const __sklib_circle c);
 int __sklib__distant_point_on_circle_heading__point_2d_ref__circle_ref__vector_2d_ref__point_2d_ref(const __sklib_point_2d pt, const __sklib_circle c, const __sklib_vector_2d heading, __sklib_point_2d *opposite_pt);
 float __sklib__ray_circle_intersect_distance__point_2d_ref__vector_2d_ref__circle_ref(const __sklib_point_2d ray_origin, const __sklib_vector_2d ray_heading, const __sklib_circle c);
@@ -616,40 +619,40 @@ int __sklib__bitmap_button__bitmap(__sklib_bitmap bmp);
 int __sklib__bitmap_button__bitmap__rectangle_ref(__sklib_bitmap bmp, const __sklib_rectangle rect);
 int __sklib__bitmap_button__bitmap__rectangle_ref__drawing_options(__sklib_bitmap bmp, const __sklib_rectangle rect, __sklib_drawing_options opts);
 int __sklib__bitmap_button__bitmap__drawing_options(__sklib_bitmap bmp, __sklib_drawing_options opts);
-int __sklib__bitmap_button__string_ref__bitmap(const __sklib_string label, __sklib_bitmap bmp);
-int __sklib__bitmap_button__string_ref__bitmap__drawing_options(const __sklib_string label, __sklib_bitmap bmp, __sklib_drawing_options opts);
+int __sklib__bitmap_button__string_ref__bitmap(const __sklib_string label_text, __sklib_bitmap bmp);
+int __sklib__bitmap_button__string_ref__bitmap__drawing_options(const __sklib_string label_text, __sklib_bitmap bmp, __sklib_drawing_options opts);
 int __sklib__button__string_ref__rectangle_ref(const __sklib_string text, const __sklib_rectangle rect);
 int __sklib__button__string_ref(const __sklib_string text);
-int __sklib__button__string_ref__string_ref(const __sklib_string label, const __sklib_string text);
+int __sklib__button__string_ref__string_ref(const __sklib_string label_text, const __sklib_string text);
 int __sklib__checkbox__string_ref__bool_ref__rectangle_ref(const __sklib_string text, const int value, const __sklib_rectangle rect);
 int __sklib__checkbox__string_ref__bool_ref(const __sklib_string text, const int value);
-int __sklib__checkbox__string_ref__string_ref__bool_ref(const __sklib_string label, const __sklib_string text, const int value);
+int __sklib__checkbox__string_ref__string_ref__bool_ref(const __sklib_string label_text, const __sklib_string text, const int value);
 __sklib_color __sklib__color_slider__color_ref__rectangle_ref(const __sklib_color clr, const __sklib_rectangle rect);
 __sklib_color __sklib__color_slider__color_ref(const __sklib_color clr);
-__sklib_color __sklib__color_slider__string_ref__color_ref(const __sklib_string label, const __sklib_color clr);
+__sklib_color __sklib__color_slider__string_ref__color_ref(const __sklib_string label_text, const __sklib_color clr);
 void __sklib__disable_interface();
 void __sklib__draw_interface();
 void __sklib__enable_interface();
 void __sklib__end_inset__string_ref(const __sklib_string name);
 void __sklib__end_panel__string_ref(const __sklib_string name);
 void __sklib__end_popup__string_ref(const __sklib_string name);
-void __sklib__end_treenode__string_ref(const __sklib_string label);
+void __sklib__end_treenode__string_ref(const __sklib_string label_text);
 void __sklib__enter_column();
 int __sklib__get_interface_label_width();
-int __sklib__header__string_ref(const __sklib_string label);
+int __sklib__header__string_ref(const __sklib_string label_text);
 __sklib_color __sklib__hsb_color_slider__color_ref__rectangle_ref(const __sklib_color clr, const __sklib_rectangle rect);
 __sklib_color __sklib__hsb_color_slider__color_ref(const __sklib_color clr);
-__sklib_color __sklib__hsb_color_slider__string_ref__color_ref(const __sklib_string label, const __sklib_color clr);
+__sklib_color __sklib__hsb_color_slider__string_ref__color_ref(const __sklib_string label_text, const __sklib_color clr);
 int __sklib__interface_enabled();
 void __sklib__interface_style_panel__rectangle_ref(const __sklib_rectangle initial_rectangle);
-void __sklib__label__string_ref(const __sklib_string text);
-void __sklib__label__string_ref__rectangle_ref(const __sklib_string text, const __sklib_rectangle rect);
+void __sklib__label_element__string_ref(const __sklib_string text);
+void __sklib__label_element__string_ref__rectangle_ref(const __sklib_string text, const __sklib_rectangle rect);
 int __sklib__last_element_changed();
 int __sklib__last_element_confirmed();
 void __sklib__leave_column();
 float __sklib__number_box__float_ref__float__rectangle_ref(const float value, float step, const __sklib_rectangle rect);
 float __sklib__number_box__float_ref__float(const float value, float step);
-float __sklib__number_box__string_ref__float_ref__float(const __sklib_string label, const float value, float step);
+float __sklib__number_box__string_ref__float_ref__float(const __sklib_string label_text, const float value, float step);
 void __sklib__open_popup__string_ref(const __sklib_string name);
 void __sklib__paragraph__string_ref(const __sklib_string text);
 void __sklib__paragraph__string_ref__rectangle_ref(const __sklib_string text, const __sklib_rectangle rect);
@@ -674,7 +677,7 @@ void __sklib__set_layout_height__int(int height);
 void __sklib__single_line_layout();
 float __sklib__slider__float_ref__float__float__rectangle_ref(const float value, float min_value, float max_value, const __sklib_rectangle rect);
 float __sklib__slider__float_ref__float__float(const float value, float min_value, float max_value);
-float __sklib__slider__string_ref__float_ref__float__float(const __sklib_string label, const float value, float min_value, float max_value);
+float __sklib__slider__string_ref__float_ref__float__float(const __sklib_string label_text, const float value, float min_value, float max_value);
 void __sklib__split_into_columns__int(int count);
 void __sklib__split_into_columns__int__int(int count, int last_width);
 void __sklib__split_into_columns_relative__int__double(int count, double last_width);
@@ -683,10 +686,10 @@ void __sklib__start_inset__string_ref__rectangle_ref(const __sklib_string name,
 void __sklib__start_inset__string_ref__int(const __sklib_string name, int height);
 int __sklib__start_panel__string_ref__rectangle(const __sklib_string name, __sklib_rectangle initial_rectangle);
 int __sklib__start_popup__string_ref(const __sklib_string name);
-int __sklib__start_treenode__string_ref(const __sklib_string label);
+int __sklib__start_treenode__string_ref(const __sklib_string label_text);
 __sklib_string __sklib__text_box__string_ref(const __sklib_string value);
 __sklib_string __sklib__text_box__string_ref__rectangle_ref(const __sklib_string value, const __sklib_rectangle rect);
-__sklib_string __sklib__text_box__string_ref__string_ref(const __sklib_string label, const __sklib_string value);
+__sklib_string __sklib__text_box__string_ref__string_ref(const __sklib_string label_text, const __sklib_string value);
 __sklib_json __sklib__create_json();
 __sklib_json __sklib__create_json__string(__sklib_string json_string);
 void __sklib__free_all_json();
@@ -816,15 +819,15 @@ __sklib_string __sklib__music_name__music(__sklib_music data);
 __sklib_music __sklib__music_named__string_ref(const __sklib_string name);
 int __sklib__music_playing();
 int __sklib__music_valid__music(__sklib_music m);
-float __sklib__music_volume();
+double __sklib__music_volume();
 void __sklib__pause_music();
 void __sklib__play_music__string_ref(const __sklib_string name);
 void __sklib__play_music__string_ref__int(const __sklib_string name, int times);
 void __sklib__play_music__music(__sklib_music data);
 void __sklib__play_music__music__int(__sklib_music data, int times);
-void __sklib__play_music__music__int__float(__sklib_music data, int times, float volume);
+void __sklib__play_music__music__int__double(__sklib_music data, int times, double volume);
 void __sklib__resume_music();
-void __sklib__set_music_volume__float(float volume);
+void __sklib__set_music_volume__double(double volume);
 void __sklib__stop_music();
 int __sklib__accept_all_new_connections();
 int __sklib__accept_new_connection__server_socket(__sklib_server_socket server);
@@ -1030,13 +1033,13 @@ void __sklib__free_sound_effect__sound_effect(__sklib_sound_effect effect);
 int __sklib__has_sound_effect__string_ref(const __sklib_string name);
 __sklib_sound_effect __sklib__load_sound_effect__string_ref__string_ref(const __sklib_string name, const __sklib_string filename);
 void __sklib__play_sound_effect__string_ref(const __sklib_string name);
-void __sklib__play_sound_effect__string_ref__float(const __sklib_string name, float volume);
+void __sklib__play_sound_effect__string_ref__double(const __sklib_string name, double volume);
 void __sklib__play_sound_effect__string_ref__int(const __sklib_string name, int times);
-void __sklib__play_sound_effect__string_ref__int__float(const __sklib_string name, int times, float volume);
+void __sklib__play_sound_effect__string_ref__int__double(const __sklib_string name, int times, double volume);
 void __sklib__play_sound_effect__sound_effect(__sklib_sound_effect effect);
-void __sklib__play_sound_effect__sound_effect__float(__sklib_sound_effect effect, float volume);
+void __sklib__play_sound_effect__sound_effect__double(__sklib_sound_effect effect, double volume);
 void __sklib__play_sound_effect__sound_effect__int(__sklib_sound_effect effect, int times);
-void __sklib__play_sound_effect__sound_effect__int__float(__sklib_sound_effect effect, int times, float volume);
+void __sklib__play_sound_effect__sound_effect__int__double(__sklib_sound_effect effect, int times, double volume);
 __sklib_string __sklib__sound_effect_filename__sound_effect(__sklib_sound_effect effect);
 __sklib_string __sklib__sound_effect_name__sound_effect(__sklib_sound_effect effect);
 __sklib_sound_effect __sklib__sound_effect_named__string_ref(const __sklib_string name);
@@ -1313,7 +1316,7 @@ int __sklib__vector_in_rect__vector_2d_ref__rectangle_ref(const __sklib_vector_2
 __sklib_vector_2d __sklib__vector_invert__vector_2d_ref(const __sklib_vector_2d v);
 __sklib_vector_2d __sklib__vector_limit__vector_2d_ref__double(const __sklib_vector_2d v, double limit);
 double __sklib__vector_magnitude__vector_2d_ref(const __sklib_vector_2d v);
-double __sklib__vector_magnitude_sqared__vector_2d_ref(const __sklib_vector_2d v);
+double __sklib__vector_magnitude_squared__vector_2d_ref(const __sklib_vector_2d v);
 __sklib_vector_2d __sklib__vector_multiply__vector_2d_ref__double(const __sklib_vector_2d v1, double s);
 __sklib_vector_2d __sklib__vector_normal__vector_2d_ref(const __sklib_vector_2d v);
 __sklib_vector_2d __sklib__vector_out_of_circle_from_circle__circle_ref__circle_ref__vector_2d_ref(const __sklib_circle src, const __sklib_circle bounds, const __sklib_vector_2d velocity);

generated/cpp/circle_geometry.h

@@ -17,13 +17,16 @@ point_2d center_point(const circle &c);
 circle circle_at(const point_2d &pt, double radius);
 circle circle_at(double x, double y, double radius);
 float circle_radius(const circle c);
+bool circle_triangle_intersect(const circle &c, const triangle &tri);
+bool circle_triangle_intersect(const circle &c, const triangle &tri, point_2d &p);
 float circle_x(const circle &c);
 float circle_y(const circle &c);
 bool circles_intersect(circle c1, circle c2);
 bool circles_intersect(double c1_x, double c1_y, double c1_radius, double c2_x, double c2_y, double c2_radius);
 point_2d closest_point_on_circle(const point_2d &from_pt, const circle &c);
 point_2d closest_point_on_line_from_circle(const circle &c, const line &l);
 point_2d closest_point_on_rect_from_circle(const circle &c, const rectangle &rect);
+point_2d closest_point_on_triangle_from_circle(const circle &c, const triangle &tri);
 point_2d distant_point_on_circle(const point_2d &pt, const circle &c);
 bool distant_point_on_circle_heading(const point_2d &pt, const circle &c, const vector_2d &heading, point_2d &opposite_pt);
 float ray_circle_intersect_distance(const point_2d &ray_origin, const vector_2d &ray_heading, const circle &c);

generated/cpp/interface.h

@@ -19,40 +19,40 @@ bool bitmap_button(bitmap bmp);
 bool bitmap_button(bitmap bmp, const rectangle &rect);
 bool bitmap_button(bitmap bmp, const rectangle &rect, drawing_options opts);
 bool bitmap_button(bitmap bmp, drawing_options opts);
-bool bitmap_button(const string &label, bitmap bmp);
-bool bitmap_button(const string &label, bitmap bmp, drawing_options opts);
+bool bitmap_button(const string &label_text, bitmap bmp);
+bool bitmap_button(const string &label_text, bitmap bmp, drawing_options opts);
 bool button(const string &text, const rectangle &rect);
 bool button(const string &text);
-bool button(const string &label, const string &text);
+bool button(const string &label_text, const string &text);
 bool checkbox(const string &text, const bool &value, const rectangle &rect);
 bool checkbox(const string &text, const bool &value);
-bool checkbox(const string &label, const string &text, const bool &value);
+bool checkbox(const string &label_text, const string &text, const bool &value);
 color color_slider(const color &clr, const rectangle &rect);
 color color_slider(const color &clr);
-color color_slider(const string &label, const color &clr);
+color color_slider(const string &label_text, const color &clr);
 void disable_interface();
 void draw_interface();
 void enable_interface();
 void end_inset(const string &name);
 void end_panel(const string &name);
 void end_popup(const string &name);
-void end_treenode(const string &label);
+void end_treenode(const string &label_text);
 void enter_column();
 int get_interface_label_width();
-bool header(const string &label);
+bool header(const string &label_text);
 color hsb_color_slider(const color &clr, const rectangle &rect);
 color hsb_color_slider(const color &clr);
-color hsb_color_slider(const string &label, const color &clr);
+color hsb_color_slider(const string &label_text, const color &clr);
 bool interface_enabled();
 void interface_style_panel(const rectangle &initial_rectangle);
-void label(const string &text);
-void label(const string &text, const rectangle &rect);
+void label_element(const string &text);
+void label_element(const string &text, const rectangle &rect);
 bool last_element_changed();
 bool last_element_confirmed();
 void leave_column();
 float number_box(const float &value, float step, const rectangle &rect);
 float number_box(const float &value, float step);
-float number_box(const string &label, const float &value, float step);
+float number_box(const string &label_text, const float &value, float step);
 void open_popup(const string &name);
 void paragraph(const string &text);
 void paragraph(const string &text, const rectangle &rect);
@@ -77,7 +77,7 @@ void set_layout_height(int height);
 void single_line_layout();
 float slider(const float &value, float min_value, float max_value, const rectangle &rect);
 float slider(const float &value, float min_value, float max_value);
-float slider(const string &label, const float &value, float min_value, float max_value);
+float slider(const string &label_text, const float &value, float min_value, float max_value);
 void split_into_columns(int count);
 void split_into_columns(int count, int last_width);
 void split_into_columns_relative(int count, double last_width);
@@ -86,9 +86,9 @@ void start_inset(const string &name, const rectangle &rect);
 void start_inset(const string &name, int height);
 bool start_panel(const string &name, rectangle initial_rectangle);
 bool start_popup(const string &name);
-bool start_treenode(const string &label);
+bool start_treenode(const string &label_text);
 string text_box(const string &value);
 string text_box(const string &value, const rectangle &rect);
-string text_box(const string &label, const string &value);
+string text_box(const string &label_text, const string &value);
 
 #endif /* __interface_h */

generated/cpp/music.h

@@ -28,15 +28,15 @@ string music_name(music data);
 music music_named(const string &name);
 bool music_playing();
 bool music_valid(music m);
-float music_volume();
+double music_volume();
 void pause_music();
 void play_music(const string &name);
 void play_music(const string &name, int times);
 void play_music(music data);
 void play_music(music data, int times);
-void play_music(music data, int times, float volume);
+void play_music(music data, int times, double volume);
 void resume_music();
-void set_music_volume(float volume);
+void set_music_volume(double volume);
 void stop_music();
 
 #endif /* __music_h */

generated/cpp/sound.h

@@ -21,13 +21,13 @@ void free_sound_effect(sound_effect effect);
 bool has_sound_effect(const string &name);
 sound_effect load_sound_effect(const string &name, const string &filename);
 void play_sound_effect(const string &name);
-void play_sound_effect(const string &name, float volume);
+void play_sound_effect(const string &name, double volume);
 void play_sound_effect(const string &name, int times);
-void play_sound_effect(const string &name, int times, float volume);
+void play_sound_effect(const string &name, int times, double volume);
 void play_sound_effect(sound_effect effect);
-void play_sound_effect(sound_effect effect, float volume);
+void play_sound_effect(sound_effect effect, double volume);
 void play_sound_effect(sound_effect effect, int times);
-void play_sound_effect(sound_effect effect, int times, float volume);
+void play_sound_effect(sound_effect effect, int times, double volume);
 string sound_effect_filename(sound_effect effect);
 string sound_effect_name(sound_effect effect);
 sound_effect sound_effect_named(const string &name);