Started work on grid creation menu
This commit is contained in:
parent
57392cdfdd
commit
55b15e0ec1
18 changed files with 533 additions and 181 deletions
|
|
@ -24,7 +24,8 @@ World::World(MainProgram& initMain, OpenWorldInfo& worldInfo):
|
|||
main(initMain),
|
||||
rMan(*this),
|
||||
drawProg(*this),
|
||||
bMan(*this)
|
||||
bMan(*this),
|
||||
gridMan(*this)
|
||||
{
|
||||
set_canvas_background_color(main.defaultCanvasBackgroundColor);
|
||||
displayName = main.displayName;
|
||||
|
|
@ -360,11 +361,7 @@ WorldScalar World::calculate_zoom_from_uniform_zoom(WorldScalar uniformZoom, Wor
|
|||
return uniformZoom * ((a1 < a2) ? a1 : a2);
|
||||
}
|
||||
|
||||
void World::draw(SkCanvas* canvas) {
|
||||
drawData.refresh_draw_optimizing_values();
|
||||
|
||||
drawProg.draw(canvas, drawData);
|
||||
|
||||
void World::draw_other_player_cursors(SkCanvas* canvas, const DrawData& drawData) {
|
||||
for(auto& [id, data] : clients) {
|
||||
if(drawData.clampDrawMaximum > data.camCoords.inverseScale && drawData.clampDrawMinimum < data.camCoords.inverseScale) {
|
||||
canvas->save();
|
||||
|
|
@ -396,3 +393,11 @@ void World::draw(SkCanvas* canvas) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
void World::draw(SkCanvas* canvas) {
|
||||
drawData.refresh_draw_optimizing_values();
|
||||
if(drawData.drawGrids)
|
||||
gridMan.draw(canvas, drawData);
|
||||
drawProg.draw(canvas, drawData);
|
||||
draw_other_player_cursors(canvas, drawData);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue