VKVM
/
simple-draw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Shaohua Tong 2019-12-18 12:28:24 +01:00
parent 8fab19dd26 5bc558c7b1
commit f19688ace6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/main.cpp
View File

@ -32,12 +32,12 @@ int main() {
vkvm::callEvent(vkvm::EventType::Redraw);
}
if((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::C) {
if((drawRender.getKeyCode()) == vkvm::KeyCode::C) {
drawRender.graphicsUpdate(CIRCLE);
vkvm::callEvent(vkvm::EventType::Redraw);
}
else if((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::R) {
else if((drawRender.getKeyCode()) == vkvm::KeyCode::R) {
drawRender.graphicsUpdate(RECTANGLE);
vkvm::callEvent(vkvm::EventType::Redraw);
}
@ -67,12 +67,12 @@ int main() {
mousePosition.y = mousePosition.y - 30;
drawRender.setMousePostion(mousePosition);
if(((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::C) && drawRender.getPainting()) {
if(((drawRender.getKeyCode()) == vkvm::KeyCode::C) && drawRender.getPainting()) {
drawRender.graphicsUpdate(CIRCLE);
vkvm::callEvent(vkvm::EventType::Redraw);
}
else if(((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::R) && drawRender.getPainting()) {
else if(((drawRender.getKeyCode()) == vkvm::KeyCode::R) && drawRender.getPainting()) {
drawRender.graphicsUpdate(RECTANGLE);
vkvm::callEvent(vkvm::EventType::Redraw);
}
@ -87,12 +87,12 @@ int main() {
vkvm::registerEvent(vkvm::EventType::KeyDown, [&drawRender]() {
drawRender.setKeyCode(vkvm::getLastPressedKey());
if((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::D) {
if((drawRender.getKeyCode()) == vkvm::KeyCode::D) {
drawRender.clear();
vkvm::callEvent(vkvm::EventType::Redraw);
}
else if((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::Q) {
else if((drawRender.getKeyCode()) == vkvm::KeyCode::Q) {
drawRender.graphicsUpdate(SHAPE);
vkvm::callEvent(vkvm::EventType::Redraw);
}
@ -101,7 +101,7 @@ int main() {
vkvm::registerEvent(vkvm::EventType::KeyUp, [&drawRender]() {
drawRender.setKeyCode(vkvm::getLastPressedKey());
if((drawRender.getKeyCode() - 65536) == vkvm::KeyCode::D) {
if((drawRender.getKeyCode()) == vkvm::KeyCode::D) {
drawRender.clear();
vkvm::callEvent(vkvm::EventType::Redraw);
}