godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
editor/plugins/particles_2d_editor_plugin.cpp
View File

@@ -35,9 +35,9 @@
void Particles2DEditorPlugin::edit(Object *p_object) {
if (p_object) {
particles=p_object->cast_to<Particles2D>();
particles = p_object->cast_to<Particles2D>();
} else {
particles=NULL;
particles = NULL;
}
}
@@ -55,145 +55,135 @@ void Particles2DEditorPlugin::make_visible(bool p_visible) {
toolbar->hide();
}
}
void Particles2DEditorPlugin::_file_selected(const String& p_file) {
void Particles2DEditorPlugin::_file_selected(const String &p_file) {
print_line("file: "+p_file);
print_line("file: " + p_file);
int epc=epoints->get_val();
int epc = epoints->get_val();
Image img;
Error err = ImageLoader::load_image(p_file,&img);
ERR_EXPLAIN(TTR("Error loading image:")+" "+p_file);
ERR_FAIL_COND(err!=OK);
Error err = ImageLoader::load_image(p_file, &img);
ERR_EXPLAIN(TTR("Error loading image:") + " " + p_file);
ERR_FAIL_COND(err != OK);
img.convert(Image::FORMAT_GRAYSCALE_ALPHA);
ERR_FAIL_COND(img.get_format()!=Image::FORMAT_GRAYSCALE_ALPHA);
Size2i s = Size2(img.get_width(),img.get_height());
ERR_FAIL_COND(s.width==0 || s.height==0);
ERR_FAIL_COND(img.get_format() != Image::FORMAT_GRAYSCALE_ALPHA);
Size2i s = Size2(img.get_width(), img.get_height());
ERR_FAIL_COND(s.width == 0 || s.height == 0);
DVector<uint8_t> data = img.get_data();
DVector<uint8_t>::Read r = data.read();
Vector<Point2i> valid_positions;
valid_positions.resize(s.width*s.height);
int vpc=0;
valid_positions.resize(s.width * s.height);
int vpc = 0;
for (int i = 0; i < s.width * s.height; i++) {
for(int i=0;i<s.width*s.height;i++) {
uint8_t a = r[i*2+1];
if (a>128) {
valid_positions[vpc++]=Point2i(i%s.width,i/s.width);
uint8_t a = r[i * 2 + 1];
if (a > 128) {
valid_positions[vpc++] = Point2i(i % s.width, i / s.width);
}
}
valid_positions.resize(vpc);
ERR_EXPLAIN(TTR("No pixels with transparency > 128 in image.."));
ERR_FAIL_COND(valid_positions.size()==0);
ERR_FAIL_COND(valid_positions.size() == 0);
DVector<Point2> epoints;
epoints.resize(epc);
DVector<Point2>::Write w = epoints.write();
Size2 extents = Size2(img.get_width()*0.5,img.get_height()*0.5);
Size2 extents = Size2(img.get_width() * 0.5, img.get_height() * 0.5);
for(int i=0;i<epc;i++) {
for (int i = 0; i < epc; i++) {
Point2 p = valid_positions[Math::rand()%vpc];
p-=s/2;
w[i]=p/extents;
Point2 p = valid_positions[Math::rand() % vpc];
p -= s / 2;
w[i] = p / extents;
}
w = DVector<Point2>::Write();
undo_redo->create_action(TTR("Set Emission Mask"));
undo_redo->add_do_method(particles,"set_emission_points",epoints);
undo_redo->add_do_method(particles,"set_emission_half_extents",extents);
undo_redo->add_undo_method(particles,"set_emission_points",particles->get_emission_points());
undo_redo->add_undo_method(particles,"set_emission_half_extents",particles->get_emission_half_extents());
undo_redo->add_do_method(particles, "set_emission_points", epoints);
undo_redo->add_do_method(particles, "set_emission_half_extents", extents);
undo_redo->add_undo_method(particles, "set_emission_points", particles->get_emission_points());
undo_redo->add_undo_method(particles, "set_emission_half_extents", particles->get_emission_half_extents());
undo_redo->commit_action();
}
void Particles2DEditorPlugin::_menu_callback(int p_idx) {
switch(p_idx) {
switch (p_idx) {
case MENU_LOAD_EMISSION_MASK: {
file->popup_centered_ratio();
} break;
case MENU_CLEAR_EMISSION_MASK: {
undo_redo->create_action(TTR("Clear Emission Mask"));
undo_redo->add_do_method(particles,"set_emission_points",DVector<Vector2>());
undo_redo->add_undo_method(particles,"set_emission_points",particles->get_emission_points());
undo_redo->add_do_method(particles, "set_emission_points", DVector<Vector2>());
undo_redo->add_undo_method(particles, "set_emission_points", particles->get_emission_points());
undo_redo->commit_action();
} break;
}
}
void Particles2DEditorPlugin::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_TREE) {
if (p_what == NOTIFICATION_ENTER_TREE) {
menu->get_popup()->connect("item_pressed",this,"_menu_callback");
menu->set_icon(menu->get_popup()->get_icon("Particles2D","EditorIcons"));
file->connect("file_selected",this,"_file_selected");
menu->get_popup()->connect("item_pressed", this, "_menu_callback");
menu->set_icon(menu->get_popup()->get_icon("Particles2D", "EditorIcons"));
file->connect("file_selected", this, "_file_selected");
}
}
void Particles2DEditorPlugin::_bind_methods() {
ObjectTypeDB::bind_method(_MD("_menu_callback"),&Particles2DEditorPlugin::_menu_callback);
ObjectTypeDB::bind_method(_MD("_file_selected"),&Particles2DEditorPlugin::_file_selected);
ObjectTypeDB::bind_method(_MD("_menu_callback"), &Particles2DEditorPlugin::_menu_callback);
ObjectTypeDB::bind_method(_MD("_file_selected"), &Particles2DEditorPlugin::_file_selected);
}
Particles2DEditorPlugin::Particles2DEditorPlugin(EditorNode *p_node) {
particles=NULL;
editor=p_node;
undo_redo=editor->get_undo_redo();
particles = NULL;
editor = p_node;
undo_redo = editor->get_undo_redo();
toolbar = memnew( HBoxContainer );
toolbar = memnew(HBoxContainer);
add_control_to_container(CONTAINER_CANVAS_EDITOR_MENU, toolbar);
toolbar->hide();
toolbar->add_child( memnew( VSeparator ) );
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 = 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("Particles");
toolbar->add_child(menu);
file = memnew( EditorFileDialog );
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());
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 = memnew(SpinBox);
epoints->set_min(1);
epoints->set_max(8192);
epoints->set_step(1);
epoints->set_val(512);
file->get_vbox()->add_margin_child(TTR("Generated Point Count:"),epoints);
file->get_vbox()->add_margin_child(TTR("Generated Point Count:"), epoints);
}
Particles2DEditorPlugin::~Particles2DEditorPlugin()
{
Particles2DEditorPlugin::~Particles2DEditorPlugin() {
}