Fixed up declarations of make_image_surface in io2d.h to match the intended declarations that are found in Clause 14 of R6. Fixed all instances of new_path to be new_figure. Fixed issue in RocksInSpace with bounding_box not having .left(), .right(), .top(), and .bottom() member functions.

Author: mikebmcl

N3888_RefImpl/RocksInSpace/Asteroid.cpp

@@ -41,7 +41,7 @@ void rocks_in_space::asteroid::draw(std::experimental::io2d::display_surface& ds
 	auto path = path_builder<>{};
 	path.clear();
 	auto v = m_physics.position() + (m_path.m_vertices[0]);
-	path.new_path(screen_space(v));
+	path.new_figure(screen_space(v));
 	std::for_each(&m_path.m_vertices[1], &m_path.m_vertices[m_path.m_count], [&](const auto& vert)
 	{
 		v += vert;

N3888_RefImpl/RocksInSpace/Maths.cpp

@@ -52,20 +52,20 @@ bool rocks_in_space::intersects(const bounding_box& a, const bounding_box& b)
 {
 	return contains(a, b.top_left()) ||
 		contains(a, b.bottom_right()) ||
-		contains(a, point_2d(b.top(), b.right())) ||
-		contains(a, point_2d(b.bottom(), b.left())) ||
+		contains(a, point_2d(b.y(), b.x() + b.width())) ||
+		contains(a, point_2d(b.y() + b.height(), b.x())) ||
 		contains(b, a.top_left()) ||
 		contains(b, a.bottom_right()) ||
-		contains(b, point_2d(a.top(), a.right())) ||
-		contains(b, point_2d(a.bottom(), a.left()));
+		contains(b, point_2d(a.y(), a.x() + a.width())) ||
+		contains(b, point_2d(a.y() + a.height(), a.x()));
 }
 
 bool rocks_in_space::contains(const bounding_box& r, const point_2d& p)
 {
-	return p.x >= r.left() &&
-		p.x <= r.right() &&
-		p.y >= r.top() &&
-		p.y <= r.bottom();
+	return p.x >= r.x() &&
+		p.x <= r.x() + r.width() &&
+		p.y >= r.y() &&
+		p.y <= r.y() + r.height();
 }
 
 float rocks_in_space::radius(const bounding_box& r)

N3888_RefImpl/RocksInSpace/Ship.cpp

@@ -49,7 +49,7 @@ void rocks_in_space::ship::draw(display_surface& ds)
 	auto path = path_builder<>{};
 	path.clear();
 	auto v = m_physics.position() + (m_path.m_vertices[0]);
-	path.new_path(screen_space(v));
+	path.new_figure(screen_space(v));
 	std::for_each(&m_path.m_vertices[1], &m_path.m_vertices[m_path.m_count], [&](const auto& vert)
 	{
 		v += vert;
@@ -90,7 +90,7 @@ void rocks_in_space::missile::draw(display_surface& ds)
 	if (!active()) return;
 
 	auto path = path_builder<>{};
-	path.new_path(screen_space(m_physics.position()));
+	path.new_figure(screen_space(m_physics.position()));
 	path.line(screen_space(m_physics.position() - m_physics.velocity()));
 
 	ds.stroke(brush{ rgba_color::white }, path);

N3888_RefImpl/SampleApp/brush_examples.cpp

@@ -10,7 +10,7 @@ namespace brush_test {
 		brush foreBrush{ rgba_color::white };
 		path_builder<> pb{};
 		imgSfc.paint(backBrush);
-		pb.new_path({ 80.0, 20.0 });
+		pb.new_figure({ 80.0, 20.0 });
 		pb.line({ 220.0, 20.0 });
 		pb.rel_line({ 60.0, 160.0 });
 		pb.rel_line({ -260.0, 0.0 });

N3888_RefImpl/SampleApp/entrypoint.cpp

@@ -68,7 +68,7 @@ int main() {
 	//	path_builder<> pb{};
 	//
 	//	pb.clear();
-	//	pb.new_path({ 80.0, 20.0 });
+	//	pb.new_figure({ 80.0, 20.0 });
 	//	pb.line({ 220.0, 20.0 });
 	//	pb.rel_line({ 60.0, 160.0 });
 	//	pb.rel_line({ -260.0, 0.0 });
@@ -82,13 +82,13 @@ int main() {
 	//	imgSfc.save("pathexample01.png"s, image_file_format::png);
 	//#endif
 	//	pb.clear();
-	//	pb.new_path({ 20.0, 20.0 });
+	//	pb.new_figure({ 20.0, 20.0 });
 	//	pb.rel_line({ 100.0, 0.0 });
 	//	pb.rel_line({ 0.0, 160.0 });
 	//	pb.rel_line({ -100.0, 0.0 });
 	//	pb.rel_line({ 0.0, -160.0 });
 	//
-	//	pb.new_path({ 180.0, 20.0 });
+	//	pb.new_figure({ 180.0, 20.0 });
 	//	pb.rel_line({ 100.0, 0.0 });
 	//	pb.rel_line({ 0.0, 160.0 });
 	//	pb.rel_line({ -100.0, 0.0 });
@@ -164,7 +164,7 @@ point_2d testArcClockwiseEndAngle(path_builder<>& pb, point_2d location, bool cl
 	point_2d ctrVal{};
 
 	// Test end angle 90 degree increments starting at 180.
-	pb.new_path(location);
+	pb.new_figure(location);
 	const point_2d initialRelLine{ 40.0, 0.0 };
 	pb.rel_line(initialRelLine);
 	location += initialRelLine;
@@ -174,28 +174,28 @@ point_2d testArcClockwiseEndAngle(path_builder<>& pb, point_2d location, bool cl
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, -pi<float>, half_pi<float>);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, -pi<float>, 0.0);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, -pi<float>, three_pi_over_two<float>);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, -two_pi<float>, pi<float>);
 	pb.rel_line({ -40.0, 0.0 });
 	if (closePath) {
@@ -204,35 +204,35 @@ point_2d testArcClockwiseEndAngle(path_builder<>& pb, point_2d location, bool cl
 
 	// Test end angle 90 degree intervals starting at 135
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, -pi<float>, pi<float> -quarterPi);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, -pi<float>, quarterPi);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, -pi<float>, -quarterPi);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, -pi<float>, pi<float> +quarterPi);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, -two_pi<float>, three_pi_over_two<float> +quarterPi);
 	pb.rel_line({ 40.0, 40.0 });
 	if (closePath) {
@@ -246,7 +246,7 @@ point_2d testArcCounterclockwiseEndAngle(path_builder<>& pb, point_2d location,
 	const float quarterPi = half_pi<float> / 2.0;
 
 	// Test end angle 90 degree increments starting at 180.
-	pb.new_path(location);
+	pb.new_figure(location);
 	const point_2d initialRelLine{ 40.0, 0.0 };
 	pb.rel_line(initialRelLine);
 	location += initialRelLine;
@@ -256,28 +256,28 @@ point_2d testArcCounterclockwiseEndAngle(path_builder<>& pb, point_2d location,
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, pi<float>, half_pi<float>);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, pi<float>, 0.0);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, pi<float>, three_pi_over_two<float>);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, two_pi<float>, pi<float>);
 	pb.rel_line({ -40.0, 0.0 });
 	if (closePath) {
@@ -286,35 +286,35 @@ point_2d testArcCounterclockwiseEndAngle(path_builder<>& pb, point_2d location,
 
 	// Test end angle 90 degree intervals starting at 135
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, pi<float>, pi<float> -quarterPi);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, pi<float>, quarterPi);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, pi<float>, -quarterPi);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, pi<float>, pi<float> +quarterPi);
 	if (closePath) {
 		pb.close_figure();
 	}
 
 	location += locadd;
-	pb.new_path(location + point_2d{ 0.0, 0.0 });
+	pb.new_figure(location + point_2d{ 0.0, 0.0 });
 	pb.arc(rad, two_pi<float>, three_pi_over_two<float> +quarterPi);
 	pb.rel_line({ 40.0, 40.0 });// *scale);
 	if (closePath) {