From 463ec11332759a920adbe0b5161ef961bbdc0103 Mon Sep 17 00:00:00 2001 From: Johannes Theiner Date: Wed, 8 Jan 2020 20:56:48 +0100 Subject: [PATCH] ~ change a few includes --- main/main.cpp | 15 --------------- src/Circle.cpp | 5 ----- src/Circle.hpp | 4 ---- src/DrawRender.cpp | 7 ++----- src/DrawRender.hpp | 15 +++++++-------- 5 files changed, 9 insertions(+), 37 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index 7fe5f25..b2e1af8 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -9,7 +9,6 @@ * @since: v0.0.1 * draw circle, square, rectangle and mouse drawing */ -void outPutPixel(int windowHeight, int windowWidth, vkvm::Color brushColor); int main() { vkvm::initialize(0); @@ -112,18 +111,4 @@ int main() { } return 0; -} - -/***************************read pixel in shared memory and test output in console******************************************/ -void outPutPixel(int windowHeight, int windowWidth, vkvm::Color penColor) { - for(int y = 0; y < windowHeight; y++) { - for(int x = 0; x < windowWidth; x++) { - if(vkvm::getPixel(x, y).getRed() == penColor.getRed()) { - std::cout << "*"; - } else { - std::cout << " "; - } - } - std::cout << "\n"; - } } \ No newline at end of file diff --git a/src/Circle.cpp b/src/Circle.cpp index d086aa9..b3ba8c0 100644 --- a/src/Circle.cpp +++ b/src/Circle.cpp @@ -1,8 +1,3 @@ -// -// Created by shaohuatong on 06.12.19. -// - -#include #include "Circle.hpp" Circle::Circle() { diff --git a/src/Circle.hpp b/src/Circle.hpp index e11d8b3..9177747 100644 --- a/src/Circle.hpp +++ b/src/Circle.hpp @@ -1,7 +1,3 @@ -// -// Created by shaohuatong on 06.12.19. -// - #ifndef SIMPLE_DRAW_CIRCLE_HPP #define SIMPLE_DRAW_CIRCLE_HPP diff --git a/src/DrawRender.cpp b/src/DrawRender.cpp index c531f38..435a0ec 100644 --- a/src/DrawRender.cpp +++ b/src/DrawRender.cpp @@ -1,10 +1,7 @@ -// -// Created by shaohuatong on 28.11.19. -// - +#include "Color.hpp" #include "DrawRender.hpp" +#include "vkvm.hpp" #include -#include #include #include diff --git a/src/DrawRender.hpp b/src/DrawRender.hpp index af1361f..083bf24 100644 --- a/src/DrawRender.hpp +++ b/src/DrawRender.hpp @@ -4,17 +4,16 @@ #ifndef SIMPLE_DRAW_DRAWRENDER_HPP #define SIMPLE_DRAW_DRAWRENDER_HPP -#include -#include "Color.hpp" -#include "vkvm.hpp" -#include -#include -#include "utils.hpp" -#include +#include "Cursor.hpp" #include "Rectangle.hpp" #include "Circle.hpp" #include "Shapes.hpp" -#include "Cursor.hpp" +#include "utils.hpp" +#include "vkvm.hpp" +#include +#include +#include +#include #define CIRCLE 0 #define RECTANGLE 1