diff --git a/main/main.cpp b/main/main.cpp index 9c4b509..8dbc8b4 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -76,7 +76,7 @@ int main(){ std::cout <<"picture" << std::endl; vkvm::Color backgroundColor = vkvm::getBackgroundColor(); for(int i = 0; i<1000; i++) { - Imagedisplay imagedisplay("../src/P7.bmp"); + Imagedisplay imagedisplay("../src/P6.bmp"); for (int w = 0; w < vkvm::getWidth(); w++) { for (int h = 0; h < vkvm::getHeight(); h++) { unsigned int a ; @@ -89,7 +89,7 @@ int main(){ sleep(5); vkvm::setDefaultValues(); - Imagedisplay imagedisplay2("../src/P6.bmp"); + Imagedisplay imagedisplay2("../src/P8.bmp"); for (int w = 0; w < vkvm::getWidth(); w++) { for (int h = 0; h < vkvm::getHeight(); h++) { @@ -101,28 +101,28 @@ int main(){ sleep(5); vkvm::setDefaultValues(); -// Imagedisplay imagedisplay3("../src/P6.bmp"); -// for (int w = 0; w < vkvm::getWidth(); w++) { -// for (int h = 0; h < vkvm::getHeight(); h++){ -// unsigned int a ; -// a = imagedisplay3.getPixel(w, h); -// vkvm::setPixel(w,h,vkvm::Color(a)); -// } -// -// } -// sleep(5); -// vkvm::setDefaultValues(); + Imagedisplay imagedisplay3("../src/P9.bmp"); + for (int w = 0; w < vkvm::getWidth(); w++) { + for (int h = 0; h < vkvm::getHeight(); h++){ + unsigned int a ; + a = imagedisplay3.getPixel(w, h); + vkvm::setPixel(w,h,vkvm::Color(a)); + } -// Imagedisplay imagedisplay4("../src/P7.bmp"); -// for (int w = 0; w < vkvm::getWidth(); w++) { -// for (int h = 0; h < vkvm::getHeight(); h++){ -// unsigned int a ; -// a = imagedisplay4.getPixel(w, h); -// vkvm::setPixel(w,h,vkvm::Color(a)); -// } -// -// } -// sleep(5); + } + sleep(5); + vkvm::setDefaultValues(); + + Imagedisplay imagedisplay4("../src/P10.bmp"); + for (int w = 0; w < vkvm::getWidth(); w++) { + for (int h = 0; h < vkvm::getHeight(); h++){ + unsigned int a ; + a = imagedisplay4.getPixel(w, h); + vkvm::setPixel(w,h,vkvm::Color(a)); + } + + } + sleep(5); } }); diff --git a/src/P7.bmp b/src/P7.bmp deleted file mode 100644 index 94d9a80..0000000 Binary files a/src/P7.bmp and /dev/null differ diff --git a/src/font1.bmp b/src/font1.bmp deleted file mode 100644 index 56e6810..0000000 Binary files a/src/font1.bmp and /dev/null differ