~ removing unnecessary redraw calls
~ fixing "clang not found" on ci
This commit is contained in:
Johannes Theiner
parent
14146d9955
commit
52ead05173
@ -30,7 +30,7 @@ make_test:
|
||||
- docker-ci
|
||||
script:
|
||||
- apt-get update
|
||||
- apt-get install -y g++ make cmake clang-tidy
|
||||
- apt-get install -y clang++ make cmake clang-tidy
|
||||
- mkdir current
|
||||
- ls | grep -v current | xargs mv -t current
|
||||
- git clone https://github.com/catchorg/Catch2.git
|
||||
@ -56,7 +56,7 @@ cmake_build:
|
||||
- docker-ci
|
||||
script:
|
||||
- apt-get update
|
||||
- apt-get install -y g++ make cmake clang-tidy
|
||||
- apt-get install -y clang++ make cmake clang-tidy
|
||||
- mkdir current
|
||||
- ls | grep -v current | xargs mv -t current
|
||||
- git clone https://github.com/catchorg/Catch2.git
|
||||
|
||||
@ -1 +1 @@
|
||||
#include "internal.hpp"
#include "vkvm.hpp"
#include "../src/Bitmap.hpp"
#include "../src/MathFunctions.hpp"
#include <unistd.h>
//time to sleep for in seconds
constexpr int sleepTime = 3;
void displayImage(const std::string &file, vkvm::GraphicMode graphicMode) {
vkvm::setMode(graphicMode);
Bitmap image(file);
vkvm::setWidth(image.getWidth());
vkvm::setHeight(image.getHeight());
for (int x = 0; x < vkvm::getWidth(); x++) {
for (int y = 0; y < vkvm::getHeight(); y++) {
unsigned int hex = image.getPixel(x, y);
vkvm::Color color = vkvm::Color(hex);
vkvm::setPixel(x, y, color);
}
}
}
void setColor(vkvm::Color color) {
for (int x = 0; x < vkvm::getWidth(); ++x) {
for (int y = 0; y < vkvm::getHeight(); ++y) {
vkvm::setPixel(x, y, color);
}
}
}
void displayImage(const std::string &file) {
displayImage(file, vkvm::GraphicMode::RGB);
#include "vkvm.hpp"
constexpr int sleepTime = 3;
#include "vkvm.hpp"
vkvm::setMode(vkvm::GraphicMode::Gray_256);
#include "vkvm.hpp"
constexpr int sleepTime = 3;
#include "vkvm.hpp"
vkvm::setMode(vkvm::GraphicMode::TwoColors);
vkvm::callEvent(vkvm::EventType::Redraw);
sleep(sleepTime);
}
int main() {
bool running = true;
vkvm::initialize(0);
while(running) {
displayImage("../res/P6.bmp");
sleep(sleepTime);
vkvm::setBackgroundColor(vkvm::red);
vkvm::setForegroundColor(vkvm::blue);
vkvm::callEvent(vkvm::EventType::Redraw);
sleep(sleepTime);
vkvm::setBackgroundColor(vkvm::black);
vkvm::setForegroundColor(vkvm::white);
vkvm::callEvent(vkvm::EventType::Redraw);
displayImage("../res/P8.bmp");
displayImage("../res/P9.bmp");
displayImage("../res/P10.bmp");
vkvm::setText("Hello World");
sleep(sleepTime);
vkvm::setFont(vkvm::FontType::FuturisticBlack);
vkvm::callEvent(vkvm::EventType::RenderText);
sleep(sleepTime);
vkvm::setText("Hello World, lorem ipsum dolor sit amet");
sleep(sleepTime);
vkvm::setFont(vkvm::FontType::ProFontIIX);
vkvm::callEvent(vkvm::EventType::RenderText);
sleep(sleepTime);
vkvm::setFont(vkvm::FontType::Unifont);
vkvm::callEvent(vkvm::EventType::RenderText);
sleep(sleepTime);
vkvm::setText("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.");
sleep(sleepTime);
vkvm::setMode(vkvm::GraphicMode::RGB);
#include <unistd.h>
#include "../src/MathFunctions.hpp"
sleep(sleepTime);
sleep(sleepTime);
setColor(vkvm::black);
sleep(sleepTime);
}
}
|
||||
#include "../src/Bitmap.hpp"
#include "../src/MathFunctions.hpp"
#include "vkvm.hpp"
#include "internal.hpp"
#include <unistd.h>
//time to sleep for in seconds
constexpr int sleepTime = 3;
void displayImage(const std::string &file, vkvm::GraphicMode graphicMode) {
vkvm::setMode(graphicMode);
Bitmap image(file);
vkvm::setWidth(image.getWidth());
vkvm::setHeight(image.getHeight());
for (int x = 0; x < vkvm::getWidth(); x++) {
for (int y = 0; y < vkvm::getHeight(); y++) {
unsigned int hex = image.getPixel(x, y);
vkvm::Color color = vkvm::Color(hex);
vkvm::setPixel(x, y, color);
}
}
}
void setColor(vkvm::Color color) {
for (int x = 0; x < vkvm::getWidth(); ++x) {
for (int y = 0; y < vkvm::getHeight(); ++y) {
vkvm::setPixel(x, y, color);
}
}
}
void displayImage(const std::string &file) {
displayImage(file, vkvm::GraphicMode::RGB);
#include "vkvm.hpp"
vkvm::setMode(vkvm::GraphicMode::Gray_256);
#include "vkvm.hpp"
vkvm::setMode(vkvm::GraphicMode::TwoColors);
sleep(sleepTime);
}
int main() {
bool running = true;
vkvm::initialize(0);
while(running) {
displayImage("../res/P6.bmp");
sleep(sleepTime);
vkvm::setBackgroundColor(vkvm::red);
vkvm::setForegroundColor(vkvm::blue);
sleep(sleepTime);
vkvm::setBackgroundColor(vkvm::black);
vkvm::setForegroundColor(vkvm::white);
displayImage("../res/P8.bmp");
displayImage("../res/P9.bmp");
displayImage("../res/P10.bmp");
vkvm::setText("Hello World");
sleep(sleepTime);
vkvm::setFont(vkvm::FontType::FuturisticBlack);
vkvm::callEvent(vkvm::EventType::RenderText);
sleep(sleepTime);
vkvm::setText("Hello World, lorem ipsum dolor sit amet");
sleep(sleepTime);
vkvm::setFont(vkvm::FontType::ProFontIIX);
vkvm::callEvent(vkvm::EventType::RenderText);
sleep(sleepTime);
vkvm::setFont(vkvm::FontType::Unifont);
vkvm::callEvent(vkvm::EventType::RenderText);
sleep(sleepTime);
vkvm::setText("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.");
sleep(sleepTime);
vkvm::setMode(vkvm::GraphicMode::RGB);
#include <unistd.h>
constexpr int sleepTime = 3;
);
sleep(sleepTime);
setColor(vkvm::black);
sleep(sleepTime);
}
}
|
||||
@ -1,18 +1,6 @@
|
||||
#include "vkvm.hpp"
|
||||
#include <cmath>
|
||||
#include <random>
|
||||
#include <chrono>
|
||||
#include <unistd.h>
|
||||
#include <internal.hpp>
|
||||
#include <thread>
|
||||
|
||||
void sinus() {
|
||||
for (int x = 0; x < vkvm::getWidth(); ++x) {
|
||||
double y = 300 * sin(x);
|
||||
vkvm::log(vkvm::LogLevel::DEBUG, y);
|
||||
vkvm::setPixel(x, static_cast<int>(y), vkvm::getForegroundColor());
|
||||
}
|
||||
}
|
||||
|
||||
long double map(long double value, long double inputMin, long double inputMax, long double outputMin, long double outputMax) {
|
||||
return (value - inputMin) * (outputMax - outputMin) / (inputMax - inputMin) + outputMin;
|
||||
@ -25,7 +13,7 @@ void mandelbrot() {
|
||||
|
||||
vkvm::setWidth(width);
|
||||
vkvm::setHeight(height);
|
||||
//vkvm::setRedrawInterval(999999);
|
||||
vkvm::setRedrawInterval(-1);
|
||||
|
||||
long double min = -2.84;
|
||||
long double max = 1;
|
||||
@ -86,5 +74,5 @@ void mandelbrot() {
|
||||
vkvm::callEvent(vkvm::EventType::Redraw);
|
||||
}
|
||||
|
||||
//vkvm::setRedrawInterval(999999);
|
||||
vkvm::setRedrawInterval(500);
|
||||
}
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
#ifndef DEMO_MATHFUNCTIONS_H
|
||||
#define DEMO_MATHFUNCTIONS_H
|
||||
|
||||
void sinus();
|
||||
void mandelbrot();
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user