Update wonder serialization and gameview

Author: Kyle Grage

include/GameView.h

@@ -79,6 +79,7 @@ class DrawingGameVisitor : public GameVisitor {
 	virtual void visit(Player&);
 	virtual void visit(ResourceTile&);
 	virtual void visit(DevelopmentCard&);
+	virtual void visit(Wonder&);
 };
 
 /**
@@ -155,4 +156,4 @@ std::unique_ptr<ViewElement> makeViewButtonColor(Fn fn, std::pair<ScreenCoordina
 	return std::unique_ptr<ViewElement>(new ViewButtonColor<Fn>(fn, rect, color));
 }
 
-#endif
+#endif

include/GameVisitor.h

@@ -9,7 +9,6 @@ class City;
 class Player;
 class DevelopmentCard;
 class Wonder;
-class CornerPiece;
 
 /**
  * A class to be extended with callbacks to handle the different classes in the model. 
@@ -31,7 +30,6 @@ class GameVisitor {
 	virtual void visit(ResourceTile&) = 0;
 	virtual void visit(DevelopmentCard&) = 0;
 	virtual void visit(Wonder&) = 0;
-	virtual void visit(CornerPiece&) = 0;
 };
 
 #endif

include/Serialization.h

@@ -33,10 +33,11 @@ class XMLVisitor : public GameVisitor {
 	virtual void visit(Player&);
 	virtual void visit(ResourceTile&);
 	virtual void visit(DevelopmentCard&);
+	virtual void visit(Wonder&);
 
 	const tinyxml2::XMLDocument& getXMLDoc() const;
 };
 
 Coordinate xmlElementToCoord(const tinyxml2::XMLElement& element);
 
-#endif
+#endif

src/GameView.cpp

@@ -220,6 +220,25 @@ void DrawingGameVisitor::visit(City& city) {
 	glEnd();
 }
 
+/**
+ * Draw a wonder. Right now is just a square.
+ * @param wonder The city to draw.
+ */
+void DrawingGameVisitor::visit(Wonder& wonder) {
+	static const auto wonderRadius = 0.06;
+
+	auto centerScreenPos = coordToScreen(wonder.getLocation());
+
+	glBindTexture(GL_TEXTURE_2D, 0);
+	glColor3d(0., 0., 0.);
+	glBegin(GL_QUADS);
+	glVertex2d(centerScreenPos.first + wonderRadius, centerScreenPos.second + wonderRadius);
+	glVertex2d(centerScreenPos.first + wonderRadius, centerScreenPos.second - wonderRadius);
+	glVertex2d(centerScreenPos.first - wonderRadius, centerScreenPos.second - wonderRadius);
+	glVertex2d(centerScreenPos.first - wonderRadius, centerScreenPos.second + wonderRadius);
+	glEnd();
+}
+
 /**
  * Draw a player.
  * @param player The player to draw.

src/Serialization.cpp

@@ -111,6 +111,26 @@ void XMLVisitor::visit(City& city) {
 	citiesElement->InsertEndChild(newCityElement);
 }
 
+/**
+ * Serialize a wonder.
+ * @param wonder The city to serialize.
+ */
+void XMLVisitor::visit(Wonder& wonder) {
+	if(!xmldoc.RootElement()->FirstChildElement("wonders")) {
+		xmldoc.RootElement()->InsertEndChild(xmldoc.NewElement("wonders"));
+	}
+	XMLElement* wondersElement = xmldoc.RootElement()->FirstChildElement("wonders");
+	XMLElement* newWonderElement = xmldoc.NewElement("wonder");
+
+	XMLElement* ownerElement = xmldoc.NewElement("owner");
+	ownerElement->InsertEndChild(xmldoc.NewText(wonder.getOwner().getName().c_str()));
+	newWonderElement->InsertEndChild(ownerElement);
+
+	newWonderElement->InsertEndChild(coordinateElement(wonder.getLocation()));
+
+	wondersElement->InsertEndChild(newWonderElement);
+}
+
 /**
  * Serialize a player.
  * @param player The player to serialize.