Merge pull request #27238 from ShyRed/cpu2dmask
Add Emission Mask to CPUParticle2D
This commit is contained in:
Rémi Verschelde
GitHub
commit
de54ee975d
|
|
@ -81,6 +81,7 @@
|
|||
#include "editor/plugins/collision_polygon_2d_editor_plugin.h"
|
||||
#include "editor/plugins/collision_polygon_editor_plugin.h"
|
||||
#include "editor/plugins/collision_shape_2d_editor_plugin.h"
|
||||
#include "editor/plugins/cpu_particles_2d_editor_plugin.h"
|
||||
#include "editor/plugins/cpu_particles_editor_plugin.h"
|
||||
#include "editor/plugins/curve_editor_plugin.h"
|
||||
#include "editor/plugins/editor_preview_plugins.h"
|
||||
|
|
@ -5913,6 +5914,7 @@ EditorNode::EditorNode() {
|
|||
add_editor_plugin(memnew(SpriteEditorPlugin(this)));
|
||||
add_editor_plugin(memnew(Skeleton2DEditorPlugin(this)));
|
||||
add_editor_plugin(memnew(ParticlesEditorPlugin(this)));
|
||||
add_editor_plugin(memnew(CPUParticles2DEditorPlugin(this)));
|
||||
add_editor_plugin(memnew(CPUParticlesEditorPlugin(this)));
|
||||
add_editor_plugin(memnew(ResourcePreloaderEditorPlugin(this)));
|
||||
add_editor_plugin(memnew(ItemListEditorPlugin(this)));
|
||||
|
|
|
|||
|
|
@ -0,0 +1,307 @@
|
|||
/*************************************************************************/
|
||||
/* cpu_particles_2d_editor_plugin.cpp */
|
||||
/*************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
/* https://godotengine.org */
|
||||
/*************************************************************************/
|
||||
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
|
||||
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
|
||||
/* */
|
||||
/* Permission is hereby granted, free of charge, to any person obtaining */
|
||||
/* a copy of this software and associated documentation files (the */
|
||||
/* "Software"), to deal in the Software without restriction, including */
|
||||
/* without limitation the rights to use, copy, modify, merge, publish, */
|
||||
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
||||
/* permit persons to whom the Software is furnished to do so, subject to */
|
||||
/* the following conditions: */
|
||||
/* */
|
||||
/* The above copyright notice and this permission notice shall be */
|
||||
/* included in all copies or substantial portions of the Software. */
|
||||
/* */
|
||||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
||||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
||||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
||||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
||||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#include "cpu_particles_2d_editor_plugin.h"
|
||||
|
||||
#include "canvas_item_editor_plugin.h"
|
||||
#include "core/io/image_loader.h"
|
||||
#include "scene/2d/cpu_particles_2d.h"
|
||||
#include "scene/gui/separator.h"
|
||||
#include "scene/resources/particles_material.h"
|
||||
|
||||
void CPUParticles2DEditorPlugin::edit(Object *p_object) {
|
||||
|
||||
particles = Object::cast_to<CPUParticles2D>(p_object);
|
||||
}
|
||||
|
||||
bool CPUParticles2DEditorPlugin::handles(Object *p_object) const {
|
||||
|
||||
return p_object->is_class("CPUParticles2D");
|
||||
}
|
||||
|
||||
void CPUParticles2DEditorPlugin::make_visible(bool p_visible) {
|
||||
|
||||
if (p_visible) {
|
||||
|
||||
toolbar->show();
|
||||
} else {
|
||||
|
||||
toolbar->hide();
|
||||
}
|
||||
}
|
||||
|
||||
void CPUParticles2DEditorPlugin::_file_selected(const String &p_file) {
|
||||
|
||||
source_emission_file = p_file;
|
||||
emission_mask->popup_centered_minsize();
|
||||
}
|
||||
|
||||
void CPUParticles2DEditorPlugin::_menu_callback(int p_idx) {
|
||||
|
||||
switch (p_idx) {
|
||||
case MENU_LOAD_EMISSION_MASK: {
|
||||
|
||||
file->popup_centered_ratio();
|
||||
|
||||
} break;
|
||||
case MENU_CLEAR_EMISSION_MASK: {
|
||||
|
||||
emission_mask->popup_centered_minsize();
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
void CPUParticles2DEditorPlugin::_generate_emission_mask() {
|
||||
|
||||
Ref<Image> img;
|
||||
img.instance();
|
||||
Error err = ImageLoader::load_image(source_emission_file, img);
|
||||
ERR_EXPLAIN(TTR("Error loading image:") + " " + source_emission_file);
|
||||
ERR_FAIL_COND(err != OK);
|
||||
|
||||
if (img->is_compressed()) {
|
||||
img->decompress();
|
||||
}
|
||||
img->convert(Image::FORMAT_RGBA8);
|
||||
ERR_FAIL_COND(img->get_format() != Image::FORMAT_RGBA8);
|
||||
Size2i s = Size2(img->get_width(), img->get_height());
|
||||
ERR_FAIL_COND(s.width == 0 || s.height == 0);
|
||||
|
||||
Vector<Point2> valid_positions;
|
||||
Vector<Point2> valid_normals;
|
||||
Vector<uint8_t> valid_colors;
|
||||
|
||||
valid_positions.resize(s.width * s.height);
|
||||
|
||||
EmissionMode emode = (EmissionMode)emission_mask_mode->get_selected();
|
||||
|
||||
if (emode == EMISSION_MODE_BORDER_DIRECTED) {
|
||||
valid_normals.resize(s.width * s.height);
|
||||
}
|
||||
|
||||
bool capture_colors = emission_colors->is_pressed();
|
||||
|
||||
if (capture_colors) {
|
||||
valid_colors.resize(s.width * s.height * 4);
|
||||
}
|
||||
|
||||
int vpc = 0;
|
||||
|
||||
{
|
||||
PoolVector<uint8_t> data = img->get_data();
|
||||
PoolVector<uint8_t>::Read r = data.read();
|
||||
|
||||
for (int i = 0; i < s.width; i++) {
|
||||
for (int j = 0; j < s.height; j++) {
|
||||
|
||||
uint8_t a = r[(j * s.width + i) * 4 + 3];
|
||||
|
||||
if (a > 128) {
|
||||
|
||||
if (emode == EMISSION_MODE_SOLID) {
|
||||
|
||||
if (capture_colors) {
|
||||
valid_colors.write[vpc * 4 + 0] = r[(j * s.width + i) * 4 + 0];
|
||||
valid_colors.write[vpc * 4 + 1] = r[(j * s.width + i) * 4 + 1];
|
||||
valid_colors.write[vpc * 4 + 2] = r[(j * s.width + i) * 4 + 2];
|
||||
valid_colors.write[vpc * 4 + 3] = r[(j * s.width + i) * 4 + 3];
|
||||
}
|
||||
valid_positions.write[vpc++] = Point2(i, j);
|
||||
|
||||
} else {
|
||||
|
||||
bool on_border = false;
|
||||
for (int x = i - 1; x <= i + 1; x++) {
|
||||
for (int y = j - 1; y <= j + 1; y++) {
|
||||
|
||||
if (x < 0 || y < 0 || x >= s.width || y >= s.height || r[(y * s.width + x) * 4 + 3] <= 128) {
|
||||
on_border = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (on_border)
|
||||
break;
|
||||
}
|
||||
|
||||
if (on_border) {
|
||||
valid_positions.write[vpc] = Point2(i, j);
|
||||
|
||||
if (emode == EMISSION_MODE_BORDER_DIRECTED) {
|
||||
Vector2 normal;
|
||||
for (int x = i - 2; x <= i + 2; x++) {
|
||||
for (int y = j - 2; y <= j + 2; y++) {
|
||||
|
||||
if (x == i && y == j)
|
||||
continue;
|
||||
|
||||
if (x < 0 || y < 0 || x >= s.width || y >= s.height || r[(y * s.width + x) * 4 + 3] <= 128) {
|
||||
normal += Vector2(x - i, y - j).normalized();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
normal.normalize();
|
||||
valid_normals.write[vpc] = normal;
|
||||
}
|
||||
|
||||
if (capture_colors) {
|
||||
valid_colors.write[vpc * 4 + 0] = r[(j * s.width + i) * 4 + 0];
|
||||
valid_colors.write[vpc * 4 + 1] = r[(j * s.width + i) * 4 + 1];
|
||||
valid_colors.write[vpc * 4 + 2] = r[(j * s.width + i) * 4 + 2];
|
||||
valid_colors.write[vpc * 4 + 3] = r[(j * s.width + i) * 4 + 3];
|
||||
}
|
||||
|
||||
vpc++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
valid_positions.resize(vpc);
|
||||
if (valid_normals.size()) {
|
||||
valid_normals.resize(vpc);
|
||||
}
|
||||
|
||||
ERR_EXPLAIN(TTR("No pixels with transparency > 128 in image..."));
|
||||
ERR_FAIL_COND(valid_positions.size() == 0);
|
||||
|
||||
if (capture_colors) {
|
||||
PoolColorArray pca;
|
||||
pca.resize(vpc);
|
||||
PoolColorArray::Write pcaw = pca.write();
|
||||
for (int i = 0; i < vpc; i += 1) {
|
||||
Color color;
|
||||
color.r = valid_colors[i * 4 + 0] / 255.0f;
|
||||
color.g = valid_colors[i * 4 + 1] / 255.0f;
|
||||
color.b = valid_colors[i * 4 + 2] / 255.0f;
|
||||
color.a = valid_colors[i * 4 + 3] / 255.0f;
|
||||
pcaw[i] = color;
|
||||
}
|
||||
particles->set_emission_colors(pca);
|
||||
}
|
||||
|
||||
if (valid_normals.size()) {
|
||||
particles->set_emission_shape(CPUParticles2D::EMISSION_SHAPE_DIRECTED_POINTS);
|
||||
PoolVector2Array norms;
|
||||
norms.resize(valid_normals.size());
|
||||
PoolVector2Array::Write normsw = norms.write();
|
||||
for (int i = 0; i < valid_normals.size(); i += 1) {
|
||||
normsw[i] = valid_normals[i];
|
||||
}
|
||||
particles->set_emission_normals(norms);
|
||||
} else {
|
||||
particles->set_emission_shape(CPUParticles2D::EMISSION_SHAPE_POINTS);
|
||||
}
|
||||
|
||||
{
|
||||
PoolVector2Array points;
|
||||
points.resize(valid_positions.size());
|
||||
PoolVector2Array::Write pointsw = points.write();
|
||||
for (int i = 0; i < valid_positions.size(); i += 1) {
|
||||
pointsw[i] = valid_positions[i];
|
||||
}
|
||||
particles->set_emission_points(points);
|
||||
}
|
||||
}
|
||||
|
||||
void CPUParticles2DEditorPlugin::_notification(int p_what) {
|
||||
|
||||
if (p_what == NOTIFICATION_ENTER_TREE) {
|
||||
|
||||
menu->get_popup()->connect("id_pressed", this, "_menu_callback");
|
||||
menu->set_icon(menu->get_popup()->get_icon("Particles2D", "EditorIcons"));
|
||||
file->connect("file_selected", this, "_file_selected");
|
||||
}
|
||||
}
|
||||
|
||||
void CPUParticles2DEditorPlugin::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_menu_callback"), &CPUParticles2DEditorPlugin::_menu_callback);
|
||||
ClassDB::bind_method(D_METHOD("_file_selected"), &CPUParticles2DEditorPlugin::_file_selected);
|
||||
ClassDB::bind_method(D_METHOD("_generate_emission_mask"), &CPUParticles2DEditorPlugin::_generate_emission_mask);
|
||||
}
|
||||
|
||||
CPUParticles2DEditorPlugin::CPUParticles2DEditorPlugin(EditorNode *p_node) {
|
||||
|
||||
particles = NULL;
|
||||
editor = p_node;
|
||||
undo_redo = editor->get_undo_redo();
|
||||
|
||||
toolbar = memnew(HBoxContainer);
|
||||
add_control_to_container(CONTAINER_CANVAS_EDITOR_MENU, toolbar);
|
||||
toolbar->hide();
|
||||
|
||||
toolbar->add_child(memnew(VSeparator));
|
||||
|
||||
menu = memnew(MenuButton);
|
||||
menu->get_popup()->add_item(TTR("Load Emission Mask"), MENU_LOAD_EMISSION_MASK);
|
||||
// menu->get_popup()->add_item(TTR("Clear Emission Mask"), MENU_CLEAR_EMISSION_MASK);
|
||||
menu->set_text(TTR("Particles"));
|
||||
toolbar->add_child(menu);
|
||||
|
||||
file = memnew(EditorFileDialog);
|
||||
List<String> ext;
|
||||
ImageLoader::get_recognized_extensions(&ext);
|
||||
for (List<String>::Element *E = ext.front(); E; E = E->next()) {
|
||||
file->add_filter("*." + E->get() + "; " + E->get().to_upper());
|
||||
}
|
||||
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
|
||||
toolbar->add_child(file);
|
||||
|
||||
epoints = memnew(SpinBox);
|
||||
epoints->set_min(1);
|
||||
epoints->set_max(8192);
|
||||
epoints->set_step(1);
|
||||
epoints->set_value(512);
|
||||
file->get_vbox()->add_margin_child(TTR("Generated Point Count:"), epoints);
|
||||
|
||||
emission_mask = memnew(ConfirmationDialog);
|
||||
emission_mask->set_title(TTR("Load Emission Mask"));
|
||||
VBoxContainer *emvb = memnew(VBoxContainer);
|
||||
emission_mask->add_child(emvb);
|
||||
emission_mask_mode = memnew(OptionButton);
|
||||
emvb->add_margin_child(TTR("Emission Mask"), emission_mask_mode);
|
||||
emission_mask_mode->add_item("Solid Pixels", EMISSION_MODE_SOLID);
|
||||
emission_mask_mode->add_item("Border Pixels", EMISSION_MODE_BORDER);
|
||||
emission_mask_mode->add_item("Directed Border Pixels", EMISSION_MODE_BORDER_DIRECTED);
|
||||
emission_colors = memnew(CheckBox);
|
||||
emission_colors->set_text(TTR("Capture from Pixel"));
|
||||
emvb->add_margin_child(TTR("Emission Colors"), emission_colors);
|
||||
|
||||
toolbar->add_child(emission_mask);
|
||||
|
||||
emission_mask->connect("confirmed", this, "_generate_emission_mask");
|
||||
}
|
||||
|
||||
CPUParticles2DEditorPlugin::~CPUParticles2DEditorPlugin() {
|
||||
}
|
||||
|
|
@ -0,0 +1,92 @@
|
|||
/*************************************************************************/
|
||||
/* cpu_particles_2d_editor_plugin.h */
|
||||
/*************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
/* https://godotengine.org */
|
||||
/*************************************************************************/
|
||||
/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
|
||||
/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
|
||||
/* */
|
||||
/* Permission is hereby granted, free of charge, to any person obtaining */
|
||||
/* a copy of this software and associated documentation files (the */
|
||||
/* "Software"), to deal in the Software without restriction, including */
|
||||
/* without limitation the rights to use, copy, modify, merge, publish, */
|
||||
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
||||
/* permit persons to whom the Software is furnished to do so, subject to */
|
||||
/* the following conditions: */
|
||||
/* */
|
||||
/* The above copyright notice and this permission notice shall be */
|
||||
/* included in all copies or substantial portions of the Software. */
|
||||
/* */
|
||||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
||||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
||||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
||||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
||||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#ifndef CPU_PARTICLES_2D_EDITOR_PLUGIN_H
|
||||
#define CPU_PARTICLES_2D_EDITOR_PLUGIN_H
|
||||
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_plugin.h"
|
||||
#include "scene/2d/collision_polygon_2d.h"
|
||||
#include "scene/2d/cpu_particles_2d.h"
|
||||
#include "scene/gui/box_container.h"
|
||||
#include "scene/gui/file_dialog.h"
|
||||
|
||||
class CPUParticles2DEditorPlugin : public EditorPlugin {
|
||||
|
||||
GDCLASS(CPUParticles2DEditorPlugin, EditorPlugin);
|
||||
|
||||
enum {
|
||||
MENU_LOAD_EMISSION_MASK,
|
||||
MENU_CLEAR_EMISSION_MASK
|
||||
};
|
||||
|
||||
enum EmissionMode {
|
||||
EMISSION_MODE_SOLID,
|
||||
EMISSION_MODE_BORDER,
|
||||
EMISSION_MODE_BORDER_DIRECTED
|
||||
};
|
||||
|
||||
CPUParticles2D *particles;
|
||||
|
||||
EditorFileDialog *file;
|
||||
EditorNode *editor;
|
||||
|
||||
HBoxContainer *toolbar;
|
||||
MenuButton *menu;
|
||||
|
||||
SpinBox *epoints;
|
||||
|
||||
ConfirmationDialog *emission_mask;
|
||||
OptionButton *emission_mask_mode;
|
||||
CheckBox *emission_colors;
|
||||
|
||||
String source_emission_file;
|
||||
|
||||
UndoRedo *undo_redo;
|
||||
void _file_selected(const String &p_file);
|
||||
void _menu_callback(int p_idx);
|
||||
void _generate_emission_mask();
|
||||
|
||||
protected:
|
||||
void _notification(int p_what);
|
||||
static void _bind_methods();
|
||||
|
||||
public:
|
||||
virtual String get_name() const { return "CPUParticles2D"; }
|
||||
bool has_main_screen() const { return false; }
|
||||
virtual void edit(Object *p_object);
|
||||
virtual bool handles(Object *p_object) const;
|
||||
virtual void make_visible(bool p_visible);
|
||||
|
||||
CPUParticles2DEditorPlugin(EditorNode *p_node);
|
||||
~CPUParticles2DEditorPlugin();
|
||||
};
|
||||
|
||||
#endif // CPU_PARTICLES_2D_EDITOR_PLUGIN_H
|
||||
|
|
@ -408,7 +408,7 @@ Particles2DEditorPlugin::Particles2DEditorPlugin(EditorNode *p_node) {
|
|||
generate_visibility_rect->connect("confirmed", this, "_generate_visibility_rect");
|
||||
|
||||
emission_mask = memnew(ConfirmationDialog);
|
||||
emission_mask->set_title(TTR("Generate Visibility Rect"));
|
||||
emission_mask->set_title(TTR("Load Emission Mask"));
|
||||
VBoxContainer *emvb = memnew(VBoxContainer);
|
||||
emission_mask->add_child(emvb);
|
||||
emission_mask_mode = memnew(OptionButton);
|
||||
|
|
|
|||
Loading…
Reference in New Issue