Update skm from latest splashkit-core updates

Author: omckeon

clang++/include/basics.h

@@ -20,7 +20,7 @@ bool is_double(const string &text);
 bool is_integer(const string &text);
 bool is_number(const string &text);
 int length_of(const string &text);
-string replace_all(const string &text, const string &substr, const string &newText);
+string replace_all(const string &text, const string &substr, const string &new_text);
 vector<string> split(const string &text, char delimiter);
 string to_lowercase(const string &text);
 string to_uppercase(const string &text);

clang++/include/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);

clang++/include/collisions.h

@@ -31,6 +31,12 @@ bool bitmap_point_collision(bitmap bmp, double bmp_x, double bmp_y, double x, do
 bool bitmap_point_collision(bitmap bmp, int cell, const matrix_2d &translation, const point_2d &pt);
 bool bitmap_point_collision(bitmap bmp, int cell, const point_2d &bmp_pt, const point_2d &pt);
 bool bitmap_point_collision(bitmap bmp, int cell, double bmp_x, double bmp_y, double x, double y);
+bool bitmap_quad_collision(bitmap bmp, int cell, const matrix_2d &translation, const quad &q);
+bool bitmap_ray_collision(bitmap bmp, const point_2d &pt, const point_2d &origin, const vector_2d &heading);
+bool bitmap_ray_collision(bitmap bmp, double x, double y, const point_2d &origin, const vector_2d &heading);
+bool bitmap_ray_collision(bitmap bmp, int cell, const matrix_2d &translation, const point_2d &origin, const vector_2d &heading);
+bool bitmap_ray_collision(bitmap bmp, int cell, const point_2d &pt, const point_2d &origin, const vector_2d &heading);
+bool bitmap_ray_collision(bitmap bmp, int cell, double x, double y, const point_2d &origin, const vector_2d &heading);
 bool bitmap_rectangle_collision(bitmap bmp, const point_2d &pt, const rectangle &rect);
 bool bitmap_rectangle_collision(bitmap bmp, double x, double y, const rectangle &rect);
 bool bitmap_rectangle_collision(bitmap bmp, int cell, const matrix_2d &translation, const rectangle &rect);
@@ -41,6 +47,7 @@ bool sprite_bitmap_collision(sprite s, bitmap bmp, int cell, const point_2d &pt)
 bool sprite_bitmap_collision(sprite s, bitmap bmp, int cell, double x, double y);
 bool sprite_collision(sprite s1, sprite s2);
 bool sprite_point_collision(sprite s, const point_2d &pt);
+bool sprite_ray_collision(sprite s, const point_2d &origin, const vector_2d &heading);
 bool sprite_rectangle_collision(sprite s, const rectangle &rect);
 
 #endif /* __collisions_h */

clang++/include/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 */

clang++/include/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 */

clang++/include/networking.h

@@ -64,6 +64,7 @@ string ipv4_to_hex(const string &a_ip);
 string ipv4_to_str(unsigned int ip);
 bool is_connection_open(connection con);
 bool is_connection_open(const string &name);
+bool is_valid_ipv4(const string &ip);
 connection last_connection(const string &name);
 connection last_connection(server_socket server);
 connection message_connection(message msg);

clang++/include/point_geometry.h

@@ -28,7 +28,7 @@ point_2d point_offset_from_origin(const vector_2d &offset);
 bool point_on_line(const point_2d &pt, const line &l);
 bool point_on_line(const point_2d &pt, const line &l, float proximity);
 float point_point_angle(const point_2d &pt1, const point_2d &pt2);
-float point_point_distance(const point_2d &pt1, const point_2d &pt2);
+double point_point_distance(const point_2d &pt1, const point_2d &pt2);
 string point_to_string(const point_2d &pt);
 point_2d random_bitmap_point(bitmap bmp);
 point_2d random_screen_point();

clang++/include/quad_geometry.h

@@ -14,6 +14,7 @@
 using std::string;
 using std::vector;
 
+quad quad_from(const point_2d &line_origin, const point_2d &line_end, double width);
 quad quad_from(const point_2d &p1, const point_2d &p2, const point_2d &p3, const point_2d &p4);
 quad quad_from(const rectangle &rect);
 quad quad_from(const rectangle &rect, const matrix_2d &transform);

clang++/include/rectangle_geometry.h

@@ -19,16 +19,16 @@ rectangle rectangle_around(const circle &c);
 rectangle rectangle_around(const line &l);
 rectangle rectangle_around(const quad &q);
 rectangle rectangle_around(const triangle &t);
-float rectangle_bottom(const rectangle &rect);
+double rectangle_bottom(const rectangle &rect);
 point_2d rectangle_center(const rectangle &rect);
 rectangle rectangle_from(const point_2d pt, const double width, const double height);
 rectangle rectangle_from(const point_2d pt1, const point_2d pt2);
 rectangle rectangle_from(double x, double y, double width, double height);
-float rectangle_left(const rectangle &rect);
+double rectangle_left(const rectangle &rect);
 rectangle rectangle_offset_by(const rectangle &rect, const vector_2d &offset);
-float rectangle_right(const rectangle &rect);
+double rectangle_right(const rectangle &rect);
 string rectangle_to_string(const rectangle &rect);
-float rectangle_top(const rectangle &rect);
+double rectangle_top(const rectangle &rect);
 bool rectangles_intersect(const rectangle &rect1, const rectangle &rect2);
 
 #endif /* __rectangle_geometry_h */

clang++/include/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);