From 211059683f1cc0ce49e29bb95c5205388fa54e3f Mon Sep 17 00:00:00 2001 From: Johannes Theiner Date: Fri, 26 Oct 2018 14:29:51 +0200 Subject: [PATCH] 05_OO: Schneeflocken --- .gitignore | 3 ++- src/05_OO/MP/Circle.h | 1 - src/05_OO/MP/shapes_main.cpp | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 928bd41..efe4796 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,8 @@ cmake-build-debug *.save bin/ /CMakeFiles +src/CMakeFiles CMakeCache.txt cmake_install.cmake Makefile -/C \ No newline at end of file +/C diff --git a/src/05_OO/MP/Circle.h b/src/05_OO/MP/Circle.h index 4a359ff..f0186d2 100644 --- a/src/05_OO/MP/Circle.h +++ b/src/05_OO/MP/Circle.h @@ -8,7 +8,6 @@ protected: int _radius; public: explicit Circle(int x = 0, int y = 0, int radius = 0, Colors color = Colors::GREEN); - void draw() override; }; diff --git a/src/05_OO/MP/shapes_main.cpp b/src/05_OO/MP/shapes_main.cpp index f3eaaf1..20dbcde 100644 --- a/src/05_OO/MP/shapes_main.cpp +++ b/src/05_OO/MP/shapes_main.cpp @@ -19,6 +19,10 @@ int main(int argc, char **argv) { shapes.push_back(new Rectangle(5, 21, 10, 10, Colors::MAGENTA)); + shapes.push_back(new Point(5, 10, Colors::WHITE)); + shapes.push_back(new Point(15, 7, Colors::WHITE)); + shapes.push_back(new Point(7, 5, Colors::WHITE)); + auto *s = new Scene(shapes); s->draw();