Merge remote-tracking branch 'origin/Development' into Development
This commit is contained in:
commit
5b5feca0ea
@ -1,4 +1,4 @@
|
|||||||
cmake_minimum_required(VERSION 3.28)
|
cmake_minimum_required(VERSION 3.27)
|
||||||
project(Pycron)
|
project(Pycron)
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
|||||||
@ -143,7 +143,7 @@ void Graphics::bindMethods(pkpy::VM *vm) {
|
|||||||
float width = pkpy::py_cast<float>(vm, args[2]);
|
float width = pkpy::py_cast<float>(vm, args[2]);
|
||||||
float height = pkpy::py_cast<float>(vm, args[3]);
|
float height = pkpy::py_cast<float>(vm, args[3]);
|
||||||
float paletteIndex = pkpy::py_cast<float>(vm, args[4]);
|
float paletteIndex = pkpy::py_cast<float>(vm, args[4]);
|
||||||
this->Rectangle(x, y, width, height, paletteIndex);
|
this->Rect(x, y, width, height, paletteIndex);
|
||||||
return vm->None;
|
return vm->None;
|
||||||
}});
|
}});
|
||||||
|
|
||||||
@ -173,7 +173,7 @@ void Graphics::Circle(int x, int y, int radius, int paletteIndex) {
|
|||||||
DrawCircle(x, y, radius, Palette[paletteIndex]);
|
DrawCircle(x, y, radius, Palette[paletteIndex]);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Graphics::Rectangle(int x, int y, int width, int height, int paletteIndex) {
|
void Graphics::Rect(int x, int y, int width, int height, int paletteIndex) {
|
||||||
DrawRectangle(x, y, width, height, Palette[paletteIndex]);
|
DrawRectangle(x, y, width, height, Palette[paletteIndex]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -58,7 +58,7 @@ public:
|
|||||||
void Clear(int paletteIndex);
|
void Clear(int paletteIndex);
|
||||||
void Pixel(int x, int y, int paletteIndex);
|
void Pixel(int x, int y, int paletteIndex);
|
||||||
void Circle(int x, int y, int radius, int paletteIndex);
|
void Circle(int x, int y, int radius, int paletteIndex);
|
||||||
void Rectangle(int x, int y, int width, int height, int paletteIndex);
|
void Rect(int x, int y, int width, int height, int paletteIndex);
|
||||||
void Text(std::string s, int x, int y, int paletteIndex);
|
void Text(std::string s, int x, int y, int paletteIndex);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user