Relintai/pandemonium_paint_experimental
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_paint_experimental.git synced 2024-11-07 16:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Work on fixing all the tools.

Browse Source
This commit is contained in:
Relintai 2022-11-18 12:28:14 +01:00
parent 518383266b
commit 3c69709c19
3 changed files with 264 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "9b512dd510207d32911064a1bbe15b80c91b006b"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "60a7e84a5dc2fc252b0c582dd8f877685d28d74a"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "props_2d": {"master": "a45822b63519d7f9fb391ab6b1dced468c6f399d"}, "pandemonium_engine": {"master": "12193b03f40b62093156dfb793996f2807f19734"}}
{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "9b512dd510207d32911064a1bbe15b80c91b006b"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "60a7e84a5dc2fc252b0c582dd8f877685d28d74a"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}, "props_2d": {"master": "a45822b63519d7f9fb391ab6b1dced468c6f399d"}, "pandemonium_engine": {"master": "65cf1c60d9d1d342749054cb0b0d5d6630891e40"}}

307
game/PaintCanvas.gd
View File

@ -2,11 +2,20 @@ tool
extends PaintCanvas
var _mouse_down : bool = false
var _mouse_button_down : int = -1
var _actions_history : Array
var _redo_history : Array
var _current_action : PaintAction
var _picked_color : bool = false
var _selection_cells : PoolVector2iArray
var _selection_colors : PoolColorArray
var _cut_pos : Vector2i
var _cut_size : Vector2i
var mouse_position : Vector2
#var canvas_position : Vector2
var canvas_mouse_position : Vector2
@ -34,7 +43,7 @@ func get_current_color() -> Color:
return proj.current_color
func handle_mouse_button_down(local_position : Vector2, event: InputEvent) -> void:
func handle_left_mouse_button_down(local_position : Vector2, event: InputEvent) -> void:
if event.device == -1:
mouse_position = get_global_mouse_position()
cell_mouse_position = local_position
@ -55,12 +64,151 @@ func handle_mouse_button_down(local_position : Vector2, event: InputEvent) -> vo
#STORE color here
arr.push_back(get_current_color())
elif current_tool == TOOL_COLORPICKER:
print("TODO")
elif current_tool == TOOL_PASTECUT:
print("TODO")
var c : Color = get_pixel(cell_mouse_position.x, cell_mouse_position.y);
if (c.a < 0.00001):
return;
_picked_color = true;
var project : PaintProject = get_paint_project()
if (project):
project.current_color = c
tool_process(local_position, event)
func handle_left_mouse_button_up(local_position : Vector2, event: InputEvent) -> void:
if event.device == -1:
mouse_position = get_global_mouse_position()
cell_mouse_position = local_position
last_mouse_position = mouse_position
last_cell_mouse_position = local_position
if current_tool == TOOL_COLORPICKER:
if (_picked_color):
current_tool = get_previous_tool()
_picked_color = false
tool_process(local_position, event)
func handle_right_mouse_button_down(local_position : Vector2, event: InputEvent) -> void:
if event.device == -1:
mouse_position = get_global_mouse_position()
cell_mouse_position = local_position
last_mouse_position = mouse_position
last_cell_mouse_position = local_position
if current_tool == TOOL_CUT:
if !event.is_pressed():
commit_action()
elif current_tool == TOOL_BUCKET:
if !_current_action:
_current_action = get_action()
var arr : Array = Array()
arr.push_back(cell_mouse_position)
arr.push_back(last_cell_mouse_position)
arr.push_back(get_current_color())
do_action(arr)
elif current_tool == TOOL_COLORPICKER:
current_tool = get_previous_tool()
elif current_tool == TOOL_PASTECUT:
commit_action()
current_tool = TOOL_PENCIL
tool_process(local_position, event)
#void PaintWindow::_draw_tool_brush() {
# paint_canvas->tool_layer->clear();
#
# switch (brush_mode) {
# case Tools::PASTECUT: {
# for (int idx = 0; idx < _selection_cells.size(); ++idx) {
# Vector2i pixel = _selection_cells[idx];
# //if pixel.x < 0 || pixel.y < 0:
# // print(pixel);
# Color color = _selection_colors[idx];
# pixel -= _cut_pos + _cut_size / 2;
# pixel += cell_mouse_position;
# paint_canvas->_set_pixel_v(paint_canvas->tool_layer, pixel, color);
# }
# } break;
# case Tools::BRUSH: {
# PoolVector2iArray pixels = BrushPrefabs::get_brush(selected_brush_prefab, brush_size_slider->get_value());
#
# PoolVector2iArray::Read r = pixels.read();
#
# for (int i = 0; i < pixels.size(); ++i) {
# Vector2i pixel = r[i];
# paint_canvas->_set_pixel(paint_canvas->tool_layer, cell_mouse_position.x + pixel.x, cell_mouse_position.y + pixel.y, _selected_color);
# //print_error("ad " + String::num(cell_mouse_position.x + pixel.x) + " " + String::num(cell_mouse_position.y + pixel.y));
# }
#
# r.release();
# } break;
# case Tools::RAINBOW: {
# paint_canvas->_set_pixel(paint_canvas->tool_layer, cell_mouse_position.x, cell_mouse_position.y, Color(0.46875, 0.446777, 0.446777, 0.196078));
# } break;
# case Tools::COLORPICKER: {
# paint_canvas->_set_pixel(paint_canvas->tool_layer, cell_mouse_position.x, cell_mouse_position.y, Color(0.866667, 0.847059, 0.847059, 0.196078));
# } break;
# default: {
# paint_canvas->_set_pixel(paint_canvas->tool_layer, cell_mouse_position.x, cell_mouse_position.y, _selected_color);
# } break;
# }
#
# paint_canvas->update();
# //TODO add here brush prefab drawing
# // paint_canvas->tool_layer->update_texture();
#}
#void PaintWindow::_handle_cut() {
# if (Input::get_singleton()->is_mouse_button_pressed(BUTTON_RIGHT)) {
# paint_canvas->clear_preview_layer();
# set_brush(_previous_tool);
# return;
# }
#
# if (Input::get_singleton()->is_mouse_button_pressed(BUTTON_LEFT)) {
# PoolVector2iArray pixels = PaintUtilities::get_pixels_in_line(cell_mouse_position, last_cell_mouse_position);
#
# PoolVector2iArray::Read r = pixels.read();
# for (int i = 0; i < pixels.size(); ++i) {
# Vector2i pixel_pos = r[i];
#
# for (int idx = 0; idx < _selection_cells.size(); ++idx) {
# Vector2i pixel = _selection_cells[idx];
# Color color = _selection_colors[idx];
# pixel -= _cut_pos + _cut_size / 2;
# pixel += pixel_pos;
# paint_canvas->set_pixel_v(pixel, color);
# }
# }
#
# r.release();
# } else {
# if (_last_preview_draw_cell_pos == cell_mouse_position) {
# return;
# }
#
# paint_canvas->clear_preview_layer();
#
# for (int idx = 0; idx < _selection_cells.size(); ++idx) {
# Vector2i pixel = _selection_cells[idx];
# Color color = _selection_colors[idx];
# pixel -= _cut_pos + _cut_size / 2;
# pixel += cell_mouse_position;
# paint_canvas->set_preview_pixel_v(pixel, color);
# }
#
# _last_preview_draw_cell_pos = cell_mouse_position;
# }
#}
func do_action(arr : Array) -> void:
if !_current_action:
@ -80,11 +228,62 @@ func commit_action() -> void:
update_textures()
if current_tool == TOOL_CUT:
print("TODO")
var ca : CutAction = _current_action;
_cut_pos = ca.mouse_start_pos;
_cut_size = ca.mouse_end_pos - ca.mouse_start_pos;
_selection_cells.clear();
_selection_colors.clear();
_selection_cells.append_array(ca.redo_cells);
_selection_colors.append_array(ca.redo_colors);
current_tool = TOOL_PASTECUT
return
_current_action = null
#void PaintWindow::redo_action_old() {
# if (_redo_history.empty()) {
# //print("nothing to redo");
# return;
# }
#
# Ref<PaintAction> action = _redo_history[_redo_history.size() - 1];
# _redo_history.remove(_redo_history.size() - 1);
#
# if (!action.is_valid()) {
# return;
# }
#
# _actions_history.push_back(action);
# action->redo_action_old(paint_canvas);
# paint_canvas->update();
#
# //print("redo action");
#}
#void PaintWindow::undo_action_old() {
# if (_actions_history.empty()) {
# return;
# }
#
# Ref<PaintAction> action = _actions_history[_actions_history.size() - 1];
# _actions_history.remove(_actions_history.size() - 1);
#
# if (!action.is_valid()) {
# return;
# }
#
# _redo_history.push_back(action);
# action->undo_action_old(paint_canvas);
# update();
# paint_canvas->update();
#
# //print("undo action")
#}
func has_point(var pos : Vector2) -> bool:
if pos.x < 0 || pos.y < 0 || pos.x > size.x || pos.y > size.y:
return false
@ -126,7 +325,14 @@ func _on_tool_changed() -> void:
_current_action = null
return
_current_action = get_action()
if get_previous_tool() == TOOL_CUT:
clear_preview()
elif get_previous_tool() == TOOL_PASTECUT:
_selection_cells.resize(0);
_selection_colors.resize(0);
if get_previous_tool() != TOOL_BUCKET:
_current_action = get_action()
func tool_process(local_position : Vector2, event: InputEvent) -> void:
if current_tool == TOOL_COLORPICKER:
@ -143,7 +349,11 @@ func tool_process(local_position : Vector2, event: InputEvent) -> void:
arr.push_back(cell_mouse_position)
arr.push_back(last_cell_mouse_position)
arr.push_back(get_current_color())
if _mouse_button_down == BUTTON_LEFT:
arr.push_back(get_current_color())
elif _mouse_button_down == BUTTON_RIGHT:
arr.push_back(Color(1, 1, 1, 0))
do_action(arr)
elif current_tool == TOOL_BRUSH:
@ -151,25 +361,30 @@ func tool_process(local_position : Vector2, event: InputEvent) -> void:
arr.push_back(cell_mouse_position)
arr.push_back(last_cell_mouse_position)
arr.push_back(get_current_color())
if _mouse_button_down == BUTTON_LEFT:
arr.push_back(get_current_color())
elif _mouse_button_down == BUTTON_RIGHT:
arr.push_back(Color(1, 1, 1, 0))
arr.push_back(brush_prefab)
arr.push_back(brush_size)
do_action(arr)
elif current_tool == TOOL_COLORPICKER:
# Nothing to do here
pass
elif current_tool == TOOL_PASTECUT:
# Array arr;
#
# arr.append(cell_mouse_position);
# arr.append(last_cell_mouse_position);
# arr.append(_selection_cells);
# arr.append(_selection_colors);
# arr.append(_cut_pos);
# arr.append(_cut_size);
#
# do_action_old(arr);
pass
var arr : Array = Array()
arr.append(cell_mouse_position);
arr.append(last_cell_mouse_position);
arr.append(_selection_cells);
arr.append(_selection_colors);
arr.append(_cut_pos);
arr.append(_cut_size);
do_action(arr);
elif current_tool == TOOL_RAINBOW:
var arr : Array = Array()
@ -177,46 +392,42 @@ func tool_process(local_position : Vector2, event: InputEvent) -> void:
arr.push_back(last_cell_mouse_position)
do_action(arr)
#RIGHTCLICK
# case Tools::PAINT: {
# Array arr;
#
# arr.append(cell_mouse_position);
# arr.append(last_cell_mouse_position);
# arr.append(Color(1, 1, 1, 0));
#
# do_action_old(arr);
# } break;
# case Tools::BRUSH: {
# Array arr;
#
# arr.append(cell_mouse_position);
# arr.append(last_cell_mouse_position);
# arr.append(Color(1, 1, 1, 0));
# arr.append(selected_brush_prefab);
# arr.append(brush_size_slider->get_value());
#
# do_action_old(arr);
func _forward_canvas_gui_input(event: InputEvent) -> bool:
if !is_visible_in_tree():
return false
if event is InputEventMouseButton:
if event.button_index != BUTTON_LEFT:
if _mouse_down && _mouse_button_down != event.button_index:
# Ignore it, but consume the event from the editor
return true
if event.button_index != BUTTON_LEFT && event.button_index != BUTTON_RIGHT:
return false
# This seems to be the easiest way to get local mouse position,
# even though the event is available
var local_position : Vector2 = get_local_mouse_position()
if _mouse_down:
if !event.pressed:
_mouse_down = false
_mouse_button_down = -1
if _mouse_button_down == BUTTON_LEFT:
handle_left_mouse_button_up(local_position, event)
commit_action()
else:
# This seems to be the easiest way to get local mouse position,
# even though the event is available
var local_position : Vector2 = get_local_mouse_position()
if has_point(local_position):
_mouse_down = true
handle_mouse_button_down(local_position, event)
_mouse_button_down = event.button_index
if _mouse_button_down == BUTTON_LEFT:
handle_left_mouse_button_down(local_position, event)
elif _mouse_button_down == BUTTON_RIGHT:
handle_right_mouse_button_down(local_position, event)
return true
if event is InputEventMouseMotion:

8
game/Project.tscn
View File

File diff suppressed because one or more lines are too long