added new model for crystal, not possible to move through crystals

2016-06-09 12:07:27 +02:00
parent 1164501158
commit 1f3188376a
8 changed files with 4783 additions and 51 deletions
@@ -6,10 +6,14 @@ class Crystal :
 	public Entity
 {
 public:
-	Crystal(const std::string &fileName, const Vec3f &position, Vec3f &rotation, const float &scale);
+	Crystal(const std::string &filled, const std::string &empty,
+		const Vec3f &position, Vec3f &rotation, const float &scale);
 	~Crystal();

-	bool filled;
+	bool isFilled;
 	void draw();
+	void pickUp();
+private:
+	std::string filled, empty;
 };