Fixed cache not updating when canvas color updated
This commit is contained in:
parent
1e30e3596d
commit
32c9329e4f
3 changed files with 11 additions and 2 deletions
|
|
@ -54,8 +54,7 @@ DrawingProgram::DrawingProgram(World& initWorld):
|
||||||
components.clientInsertCallback(c);
|
components.clientInsertCallback(c);
|
||||||
};
|
};
|
||||||
components.clientServerFirstPosShiftCallback = [&](uint64_t firstShiftPos) {
|
components.clientServerFirstPosShiftCallback = [&](uint64_t firstShiftPos) {
|
||||||
compCache.clear_own_cached_surfaces();
|
clear_draw_cache();
|
||||||
selection.clear_own_cached_surfaces();
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -171,6 +170,11 @@ std::unordered_set<ServerClientID> DrawingProgram::get_used_resources() {
|
||||||
return toRet;
|
return toRet;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DrawingProgram::clear_draw_cache() {
|
||||||
|
compCache.clear_own_cached_surfaces();
|
||||||
|
selection.clear_own_cached_surfaces();
|
||||||
|
}
|
||||||
|
|
||||||
void DrawingProgram::toolbar_gui() {
|
void DrawingProgram::toolbar_gui() {
|
||||||
Toolbar& t = world.main.toolbar;
|
Toolbar& t = world.main.toolbar;
|
||||||
CLAY({
|
CLAY({
|
||||||
|
|
|
||||||
|
|
@ -53,6 +53,8 @@ class DrawingProgram {
|
||||||
|
|
||||||
void switch_to_tool(DrawingProgramToolType newToolType);
|
void switch_to_tool(DrawingProgramToolType newToolType);
|
||||||
void switch_to_tool_ptr(std::unique_ptr<DrawingProgramToolBase> newTool);
|
void switch_to_tool_ptr(std::unique_ptr<DrawingProgramToolBase> newTool);
|
||||||
|
|
||||||
|
void clear_draw_cache();
|
||||||
private:
|
private:
|
||||||
void client_erase_set(std::unordered_set<CollabListType::ObjectInfoPtr> erasedComponents); // The set might be modified while this is being called, so dont pass by reference
|
void client_erase_set(std::unordered_set<CollabListType::ObjectInfoPtr> erasedComponents); // The set might be modified while this is being called, so dont pass by reference
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -175,10 +175,13 @@ void World::set_canvas_background_color(const Vector3f& newBackColor, bool sendC
|
||||||
if(newBackColor != convert_vec3<Vector3f>(canvasTheme.backColor)) {
|
if(newBackColor != convert_vec3<Vector3f>(canvasTheme.backColor)) {
|
||||||
canvasTheme.backColor = SkColor4f{newBackColor.x(), newBackColor.y(), newBackColor.z(), 1.0f};
|
canvasTheme.backColor = SkColor4f{newBackColor.x(), newBackColor.y(), newBackColor.z(), 1.0f};
|
||||||
Vector3f newHSV = rgb_to_hsv<Vector3f>(newBackColor);
|
Vector3f newHSV = rgb_to_hsv<Vector3f>(newBackColor);
|
||||||
|
SkColor4f oldToolFrontColor = canvasTheme.toolFrontColor;
|
||||||
if(newHSV.z() >= 0.6f)
|
if(newHSV.z() >= 0.6f)
|
||||||
canvasTheme.toolFrontColor = SkColor4f{0.0f, 0.0f, 0.0f, 1.0f};
|
canvasTheme.toolFrontColor = SkColor4f{0.0f, 0.0f, 0.0f, 1.0f};
|
||||||
else
|
else
|
||||||
canvasTheme.toolFrontColor = SkColor4f{1.0f, 1.0f, 1.0f, 1.0f};
|
canvasTheme.toolFrontColor = SkColor4f{1.0f, 1.0f, 1.0f, 1.0f};
|
||||||
|
if(oldToolFrontColor != canvasTheme.toolFrontColor)
|
||||||
|
drawProg.clear_draw_cache();
|
||||||
if(sendChangeOverNetwork)
|
if(sendChangeOverNetwork)
|
||||||
con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_CANVAS_COLOR, newBackColor);
|
con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_CANVAS_COLOR, newBackColor);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue