A Whole New World (clang-format edition)
I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
This commit is contained in:
Rémi Verschelde
@ -28,17 +28,15 @@
|
||||
/*************************************************************************/
|
||||
#include "color_picker.h"
|
||||
|
||||
#include "scene/gui/separator.h"
|
||||
#include "scene/main/viewport.h"
|
||||
#include "os/os.h"
|
||||
#include "os/input.h"
|
||||
#include "os/keyboard.h"
|
||||
|
||||
#include "os/os.h"
|
||||
#include "scene/gui/separator.h"
|
||||
#include "scene/main/viewport.h"
|
||||
|
||||
void ColorPicker::_notification(int p_what) {
|
||||
|
||||
|
||||
switch(p_what) {
|
||||
switch (p_what) {
|
||||
case NOTIFICATION_THEME_CHANGED: {
|
||||
//sample->set_texture(get_icon("color_sample"));
|
||||
|
||||
@ -50,8 +48,6 @@ void ColorPicker::_notification(int p_what) {
|
||||
|
||||
_update_color();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -72,16 +68,15 @@ void ColorPicker::_update_controls() {
|
||||
scroll[3]->hide();
|
||||
labels[3]->hide();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void ColorPicker::set_pick_color(const Color& p_color) {
|
||||
void ColorPicker::set_pick_color(const Color &p_color) {
|
||||
|
||||
color=p_color;
|
||||
color = p_color;
|
||||
if (color != last_hsv) {
|
||||
h=color.get_h();
|
||||
s=color.get_s();
|
||||
v=color.get_v();
|
||||
h = color.get_h();
|
||||
s = color.get_s();
|
||||
v = color.get_v();
|
||||
last_hsv = color;
|
||||
}
|
||||
|
||||
@ -92,12 +87,11 @@ void ColorPicker::set_pick_color(const Color& p_color) {
|
||||
uv_edit->get_child(0)->cast_to<Control>()->update();
|
||||
w_edit->get_child(0)->cast_to<Control>()->update();
|
||||
_update_color();
|
||||
|
||||
}
|
||||
|
||||
void ColorPicker::set_edit_alpha(bool p_show) {
|
||||
|
||||
edit_alpha=p_show;
|
||||
edit_alpha = p_show;
|
||||
_update_controls();
|
||||
|
||||
if (!is_inside_tree())
|
||||
@ -117,19 +111,18 @@ void ColorPicker::_value_changed(double) {
|
||||
if (updating)
|
||||
return;
|
||||
|
||||
for(int i=0;i<4;i++) {
|
||||
color.components[i] = scroll[i]->get_value()/(raw_mode_enabled?1.0:255.0);
|
||||
for (int i = 0; i < 4; i++) {
|
||||
color.components[i] = scroll[i]->get_value() / (raw_mode_enabled ? 1.0 : 255.0);
|
||||
}
|
||||
|
||||
set_pick_color(color);
|
||||
|
||||
_update_text_value();
|
||||
|
||||
emit_signal("color_changed",color);
|
||||
|
||||
emit_signal("color_changed", color);
|
||||
}
|
||||
|
||||
void ColorPicker::_html_entered(const String& p_html) {
|
||||
void ColorPicker::_html_entered(const String &p_html) {
|
||||
|
||||
if (updating)
|
||||
return;
|
||||
@ -140,14 +133,14 @@ void ColorPicker::_html_entered(const String& p_html) {
|
||||
return;
|
||||
|
||||
set_pick_color(color);
|
||||
emit_signal("color_changed",color);
|
||||
emit_signal("color_changed", color);
|
||||
}
|
||||
|
||||
void ColorPicker::_update_color() {
|
||||
|
||||
updating=true;
|
||||
updating = true;
|
||||
|
||||
for(int i=0;i<4;i++) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
scroll[i]->set_max(255);
|
||||
scroll[i]->set_step(0.01);
|
||||
if (raw_mode_enabled) {
|
||||
@ -162,30 +155,29 @@ void ColorPicker::_update_color() {
|
||||
_update_text_value();
|
||||
|
||||
sample->update();
|
||||
updating=false;
|
||||
updating = false;
|
||||
}
|
||||
|
||||
void ColorPicker::_update_presets()
|
||||
{
|
||||
Size2 size=bt_add_preset->get_size();
|
||||
preset->set_custom_minimum_size(Size2(size.width*presets.size(),size.height));
|
||||
void ColorPicker::_update_presets() {
|
||||
Size2 size = bt_add_preset->get_size();
|
||||
preset->set_custom_minimum_size(Size2(size.width * presets.size(), size.height));
|
||||
|
||||
PoolVector<uint8_t> img;
|
||||
img.resize(size.x*presets.size()*size.y*3);
|
||||
img.resize(size.x * presets.size() * size.y * 3);
|
||||
|
||||
{
|
||||
PoolVector<uint8_t>::Write w=img.write();
|
||||
for (int y=0;y<size.y;y++) {
|
||||
for (int x=0;x<size.x*presets.size();x++) {
|
||||
int ofs = (y*(size.x*presets.size())+x)*3;
|
||||
w[ofs+0]=uint8_t(CLAMP(presets[(int)x/size.x].r*255.0,0,255));
|
||||
w[ofs+1]=uint8_t(CLAMP(presets[(int)x/size.x].g*255.0,0,255));
|
||||
w[ofs+2]=uint8_t(CLAMP(presets[(int)x/size.x].b*255.0,0,255));
|
||||
PoolVector<uint8_t>::Write w = img.write();
|
||||
for (int y = 0; y < size.y; y++) {
|
||||
for (int x = 0; x < size.x * presets.size(); x++) {
|
||||
int ofs = (y * (size.x * presets.size()) + x) * 3;
|
||||
w[ofs + 0] = uint8_t(CLAMP(presets[(int)x / size.x].r * 255.0, 0, 255));
|
||||
w[ofs + 1] = uint8_t(CLAMP(presets[(int)x / size.x].g * 255.0, 0, 255));
|
||||
w[ofs + 2] = uint8_t(CLAMP(presets[(int)x / size.x].b * 255.0, 0, 255));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Image i(size.x*presets.size(),size.y, false, Image::FORMAT_RGB8,img);
|
||||
Image i(size.x * presets.size(), size.y, false, Image::FORMAT_RGB8, img);
|
||||
|
||||
Ref<ImageTexture> t;
|
||||
t.instance();
|
||||
@ -193,8 +185,7 @@ void ColorPicker::_update_presets()
|
||||
preset->set_texture(t);
|
||||
}
|
||||
|
||||
void ColorPicker::_text_type_toggled()
|
||||
{
|
||||
void ColorPicker::_text_type_toggled() {
|
||||
if (!get_tree()->is_editor_hint())
|
||||
return;
|
||||
text_is_constructor = !text_is_constructor;
|
||||
@ -213,25 +204,23 @@ Color ColorPicker::get_pick_color() const {
|
||||
return color;
|
||||
}
|
||||
|
||||
void ColorPicker::add_preset(const Color &p_color)
|
||||
{
|
||||
void ColorPicker::add_preset(const Color &p_color) {
|
||||
if (presets.find(p_color)) {
|
||||
presets.move_to_back(presets.find(p_color));
|
||||
} else {
|
||||
presets.push_back(p_color);
|
||||
}
|
||||
_update_presets();
|
||||
if (presets.size()==10)
|
||||
if (presets.size() == 10)
|
||||
bt_add_preset->hide();
|
||||
}
|
||||
|
||||
|
||||
void ColorPicker::set_raw_mode(bool p_enabled) {
|
||||
|
||||
if (raw_mode_enabled==p_enabled)
|
||||
if (raw_mode_enabled == p_enabled)
|
||||
return;
|
||||
raw_mode_enabled=p_enabled;
|
||||
if (btn_mode->is_pressed()!=p_enabled)
|
||||
raw_mode_enabled = p_enabled;
|
||||
if (btn_mode->is_pressed() != p_enabled)
|
||||
btn_mode->set_pressed(p_enabled);
|
||||
|
||||
if (!is_inside_tree())
|
||||
@ -246,79 +235,77 @@ bool ColorPicker::is_raw_mode() const {
|
||||
return raw_mode_enabled;
|
||||
}
|
||||
|
||||
|
||||
void ColorPicker::_update_text_value() {
|
||||
if (text_is_constructor) {
|
||||
String t = "Color("+String::num(color.r)+","+String::num(color.g)+","+String::num(color.b);
|
||||
if (edit_alpha && color.a<1)
|
||||
t+=(","+String::num(color.a)+")") ;
|
||||
String t = "Color(" + String::num(color.r) + "," + String::num(color.g) + "," + String::num(color.b);
|
||||
if (edit_alpha && color.a < 1)
|
||||
t += ("," + String::num(color.a) + ")");
|
||||
else
|
||||
t+=")";
|
||||
t += ")";
|
||||
c_text->set_text(t);
|
||||
} else {
|
||||
c_text->set_text(color.to_html(edit_alpha && color.a<1));
|
||||
c_text->set_text(color.to_html(edit_alpha && color.a < 1));
|
||||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_sample_draw() {
|
||||
sample->draw_rect(Rect2(Point2(),Size2(256,20)),color);
|
||||
sample->draw_rect(Rect2(Point2(), Size2(256, 20)), color);
|
||||
}
|
||||
|
||||
void ColorPicker::_hsv_draw(int p_wich,Control* c)
|
||||
{
|
||||
void ColorPicker::_hsv_draw(int p_wich, Control *c) {
|
||||
if (!c)
|
||||
return;
|
||||
if (p_wich==0) {
|
||||
if (p_wich == 0) {
|
||||
Vector<Point2> points;
|
||||
points.push_back(Vector2());
|
||||
points.push_back(Vector2(c->get_size().x,0));
|
||||
points.push_back(Vector2(c->get_size().x, 0));
|
||||
points.push_back(c->get_size());
|
||||
points.push_back(Vector2(0,c->get_size().y));
|
||||
points.push_back(Vector2(0, c->get_size().y));
|
||||
Vector<Color> colors;
|
||||
colors.push_back(Color(1,1,1));
|
||||
colors.push_back(Color(1,1,1));
|
||||
colors.push_back(Color(1, 1, 1));
|
||||
colors.push_back(Color(1, 1, 1));
|
||||
colors.push_back(Color());
|
||||
colors.push_back(Color());
|
||||
c->draw_polygon(points,colors);
|
||||
c->draw_polygon(points, colors);
|
||||
Vector<Color> colors2;
|
||||
Color col = color;
|
||||
col.set_hsv(color.get_h(),1,1);
|
||||
col.set_hsv(color.get_h(), 1, 1);
|
||||
col.a = 0;
|
||||
colors2.push_back(col);
|
||||
col.a = 1;
|
||||
colors2.push_back(col);
|
||||
col.set_hsv(color.get_h(),1,0);
|
||||
col.set_hsv(color.get_h(), 1, 0);
|
||||
colors2.push_back(col);
|
||||
col.a = 0;
|
||||
colors2.push_back(col);
|
||||
c->draw_polygon(points,colors);
|
||||
c->draw_polygon(points, colors);
|
||||
int x = CLAMP(c->get_size().x * s, 0, c->get_size().x);
|
||||
int y = CLAMP(c->get_size().y-c->get_size().y * v, 0, c->get_size().y);
|
||||
int y = CLAMP(c->get_size().y - c->get_size().y * v, 0, c->get_size().y);
|
||||
col = color;
|
||||
col.a=1;
|
||||
c->draw_line(Point2(x,0),Point2(x,c->get_size().y),col.inverted());
|
||||
c->draw_line(Point2(0, y),Point2(c->get_size().x, y),col.inverted());
|
||||
c->draw_line(Point2(x,y),Point2(x,y),Color(1,1,1),2);
|
||||
} else if (p_wich==1) {
|
||||
Ref<Texture> hue = get_icon("color_hue","ColorPicker");
|
||||
c->draw_texture_rect(hue,Rect2(Point2(),c->get_size()));
|
||||
int y=c->get_size().y-c->get_size().y*h;
|
||||
Color col=Color();
|
||||
col.set_hsv(h,1,1);
|
||||
c->draw_line(Point2(0,y),Point2(c->get_size().x,y),col.inverted());
|
||||
col.a = 1;
|
||||
c->draw_line(Point2(x, 0), Point2(x, c->get_size().y), col.inverted());
|
||||
c->draw_line(Point2(0, y), Point2(c->get_size().x, y), col.inverted());
|
||||
c->draw_line(Point2(x, y), Point2(x, y), Color(1, 1, 1), 2);
|
||||
} else if (p_wich == 1) {
|
||||
Ref<Texture> hue = get_icon("color_hue", "ColorPicker");
|
||||
c->draw_texture_rect(hue, Rect2(Point2(), c->get_size()));
|
||||
int y = c->get_size().y - c->get_size().y * h;
|
||||
Color col = Color();
|
||||
col.set_hsv(h, 1, 1);
|
||||
c->draw_line(Point2(0, y), Point2(c->get_size().x, y), col.inverted());
|
||||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_uv_input(const InputEvent &ev) {
|
||||
if (ev.type == InputEvent::MOUSE_BUTTON) {
|
||||
const InputEventMouseButton &bev = ev.mouse_button;
|
||||
if (bev.pressed && bev.button_index==BUTTON_LEFT) {
|
||||
if (bev.pressed && bev.button_index == BUTTON_LEFT) {
|
||||
changing_color = true;
|
||||
float x = CLAMP((float)bev.x,0,256);
|
||||
float y = CLAMP((float)bev.y,0,256);
|
||||
s=x/256;
|
||||
v=1.0-y/256.0;
|
||||
color.set_hsv(h,s,v,color.a);
|
||||
float x = CLAMP((float)bev.x, 0, 256);
|
||||
float y = CLAMP((float)bev.y, 0, 256);
|
||||
s = x / 256;
|
||||
v = 1.0 - y / 256.0;
|
||||
color.set_hsv(h, s, v, color.a);
|
||||
last_hsv = color;
|
||||
set_pick_color(color);
|
||||
_update_color();
|
||||
@ -330,11 +317,11 @@ void ColorPicker::_uv_input(const InputEvent &ev) {
|
||||
const InputEventMouse &bev = ev.mouse_motion;
|
||||
if (!changing_color)
|
||||
return;
|
||||
float x = CLAMP((float)bev.x,0,256);
|
||||
float y = CLAMP((float)bev.y,0,256);
|
||||
s=x/256;
|
||||
v=1.0-y/256.0;
|
||||
color.set_hsv(h,s,v,color.a);
|
||||
float x = CLAMP((float)bev.x, 0, 256);
|
||||
float y = CLAMP((float)bev.y, 0, 256);
|
||||
s = x / 256;
|
||||
v = 1.0 - y / 256.0;
|
||||
color.set_hsv(h, s, v, color.a);
|
||||
last_hsv = color;
|
||||
set_pick_color(color);
|
||||
_update_color();
|
||||
@ -345,14 +332,14 @@ void ColorPicker::_uv_input(const InputEvent &ev) {
|
||||
void ColorPicker::_w_input(const InputEvent &ev) {
|
||||
if (ev.type == InputEvent::MOUSE_BUTTON) {
|
||||
const InputEventMouseButton &bev = ev.mouse_button;
|
||||
if (bev.pressed && bev.button_index==BUTTON_LEFT) {
|
||||
if (bev.pressed && bev.button_index == BUTTON_LEFT) {
|
||||
changing_color = true;
|
||||
h=1-((float)bev.y)/256.0;
|
||||
h = 1 - ((float)bev.y) / 256.0;
|
||||
|
||||
} else {
|
||||
changing_color = false;
|
||||
}
|
||||
color.set_hsv(h,s,v,color.a);
|
||||
color.set_hsv(h, s, v, color.a);
|
||||
last_hsv = color;
|
||||
set_pick_color(color);
|
||||
_update_color();
|
||||
@ -361,9 +348,9 @@ void ColorPicker::_w_input(const InputEvent &ev) {
|
||||
const InputEventMouse &bev = ev.mouse_motion;
|
||||
if (!changing_color)
|
||||
return;
|
||||
float y = CLAMP((float)bev.y,0,256);
|
||||
h=1.0-y/256.0;
|
||||
color.set_hsv(h,s,v,color.a);
|
||||
float y = CLAMP((float)bev.y, 0, 256);
|
||||
h = 1.0 - y / 256.0;
|
||||
color.set_hsv(h, s, v, color.a);
|
||||
last_hsv = color;
|
||||
set_pick_color(color);
|
||||
_update_color();
|
||||
@ -374,11 +361,11 @@ void ColorPicker::_w_input(const InputEvent &ev) {
|
||||
void ColorPicker::_preset_input(const InputEvent &ev) {
|
||||
if (ev.type == InputEvent::MOUSE_BUTTON) {
|
||||
const InputEventMouseButton &bev = ev.mouse_button;
|
||||
if (bev.pressed && bev.button_index==BUTTON_LEFT) {
|
||||
int index = bev.x/(preset->get_size().x/presets.size());
|
||||
if (bev.pressed && bev.button_index == BUTTON_LEFT) {
|
||||
int index = bev.x / (preset->get_size().x / presets.size());
|
||||
set_pick_color(presets[index]);
|
||||
} else if (bev.pressed && bev.button_index==BUTTON_RIGHT) {
|
||||
int index = bev.x/(preset->get_size().x/presets.size());
|
||||
} else if (bev.pressed && bev.button_index == BUTTON_RIGHT) {
|
||||
int index = bev.x / (preset->get_size().x / presets.size());
|
||||
presets.erase(presets[index]);
|
||||
_update_presets();
|
||||
bt_add_preset->show();
|
||||
@ -388,42 +375,41 @@ void ColorPicker::_preset_input(const InputEvent &ev) {
|
||||
} else if (ev.type == InputEvent::MOUSE_MOTION) {
|
||||
const InputEventMouse &mev = ev.mouse_motion;
|
||||
int index = mev.x * presets.size();
|
||||
if( preset->get_size().x != 0 ) {
|
||||
if (preset->get_size().x != 0) {
|
||||
index /= preset->get_size().x;
|
||||
}
|
||||
if (index<0 || index >= presets.size())
|
||||
if (index < 0 || index >= presets.size())
|
||||
return;
|
||||
preset->set_tooltip("Color: #"+presets[index].to_html(presets[index].a<1)+"\n"
|
||||
"LMB: Set color\n"
|
||||
"RMB: Remove preset");
|
||||
preset->set_tooltip("Color: #" + presets[index].to_html(presets[index].a < 1) + "\n"
|
||||
"LMB: Set color\n"
|
||||
"RMB: Remove preset");
|
||||
}
|
||||
}
|
||||
|
||||
void ColorPicker::_screen_input(const InputEvent &ev)
|
||||
{
|
||||
if (ev.type==InputEvent::MOUSE_BUTTON) {
|
||||
void ColorPicker::_screen_input(const InputEvent &ev) {
|
||||
if (ev.type == InputEvent::MOUSE_BUTTON) {
|
||||
const InputEventMouseButton &bev = ev.mouse_button;
|
||||
if (bev.button_index==BUTTON_LEFT&&!bev.pressed) {
|
||||
if (bev.button_index == BUTTON_LEFT && !bev.pressed) {
|
||||
emit_signal("color_changed", color);
|
||||
screen->hide();
|
||||
}
|
||||
} else if (ev.type==InputEvent::MOUSE_MOTION) {
|
||||
} else if (ev.type == InputEvent::MOUSE_MOTION) {
|
||||
const InputEventMouse &mev = ev.mouse_motion;
|
||||
Viewport *r=get_tree()->get_root();
|
||||
if (!r->get_visible_rect().has_point(Point2(mev.global_x,mev.global_y)))
|
||||
Viewport *r = get_tree()->get_root();
|
||||
if (!r->get_visible_rect().has_point(Point2(mev.global_x, mev.global_y)))
|
||||
return;
|
||||
Image img =r->get_screen_capture();
|
||||
Image img = r->get_screen_capture();
|
||||
if (!img.empty()) {
|
||||
last_capture=img;
|
||||
last_capture = img;
|
||||
r->queue_screen_capture();
|
||||
}
|
||||
if (!last_capture.empty()) {
|
||||
int pw = last_capture.get_format()==Image::FORMAT_RGBA8?4:3;
|
||||
int ofs = (mev.global_y*last_capture.get_width()+mev.global_x)*pw;
|
||||
int pw = last_capture.get_format() == Image::FORMAT_RGBA8 ? 4 : 3;
|
||||
int ofs = (mev.global_y * last_capture.get_width() + mev.global_x) * pw;
|
||||
|
||||
PoolVector<uint8_t>::Read r = last_capture.get_data().read();
|
||||
|
||||
Color c( r[ofs+0]/255.0, r[ofs+1]/255.0, r[ofs+2]/255.0 );
|
||||
Color c(r[ofs + 0] / 255.0, r[ofs + 1] / 255.0, r[ofs + 2] / 255.0);
|
||||
|
||||
set_pick_color(c);
|
||||
}
|
||||
@ -434,15 +420,14 @@ void ColorPicker::_add_preset_pressed() {
|
||||
add_preset(color);
|
||||
}
|
||||
|
||||
void ColorPicker::_screen_pick_pressed()
|
||||
{
|
||||
Viewport *r=get_tree()->get_root();
|
||||
void ColorPicker::_screen_pick_pressed() {
|
||||
Viewport *r = get_tree()->get_root();
|
||||
if (!screen) {
|
||||
screen=memnew( Control );
|
||||
screen = memnew(Control);
|
||||
r->add_child(screen);
|
||||
screen->set_as_toplevel(true);
|
||||
screen->set_area_as_parent_rect();
|
||||
screen->connect("gui_input",this,"_screen_input");
|
||||
screen->connect("gui_input", this, "_screen_input");
|
||||
}
|
||||
screen->raise();
|
||||
screen->show_modal();
|
||||
@ -451,199 +436,182 @@ void ColorPicker::_screen_pick_pressed()
|
||||
|
||||
void ColorPicker::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_pick_color","color"),&ColorPicker::set_pick_color);
|
||||
ClassDB::bind_method(D_METHOD("get_pick_color"),&ColorPicker::get_pick_color);
|
||||
ClassDB::bind_method(D_METHOD("set_raw_mode","mode"),&ColorPicker::set_raw_mode);
|
||||
ClassDB::bind_method(D_METHOD("is_raw_mode"),&ColorPicker::is_raw_mode);
|
||||
ClassDB::bind_method(D_METHOD("set_edit_alpha","show"),&ColorPicker::set_edit_alpha);
|
||||
ClassDB::bind_method(D_METHOD("is_editing_alpha"),&ColorPicker::is_editing_alpha);
|
||||
ClassDB::bind_method(D_METHOD("set_pick_color", "color"), &ColorPicker::set_pick_color);
|
||||
ClassDB::bind_method(D_METHOD("get_pick_color"), &ColorPicker::get_pick_color);
|
||||
ClassDB::bind_method(D_METHOD("set_raw_mode", "mode"), &ColorPicker::set_raw_mode);
|
||||
ClassDB::bind_method(D_METHOD("is_raw_mode"), &ColorPicker::is_raw_mode);
|
||||
ClassDB::bind_method(D_METHOD("set_edit_alpha", "show"), &ColorPicker::set_edit_alpha);
|
||||
ClassDB::bind_method(D_METHOD("is_editing_alpha"), &ColorPicker::is_editing_alpha);
|
||||
ClassDB::bind_method(D_METHOD("add_preset"), &ColorPicker::add_preset);
|
||||
ClassDB::bind_method(D_METHOD("_value_changed"),&ColorPicker::_value_changed);
|
||||
ClassDB::bind_method(D_METHOD("_html_entered"),&ColorPicker::_html_entered);
|
||||
ClassDB::bind_method(D_METHOD("_text_type_toggled"),&ColorPicker::_text_type_toggled);
|
||||
ClassDB::bind_method(D_METHOD("_value_changed"), &ColorPicker::_value_changed);
|
||||
ClassDB::bind_method(D_METHOD("_html_entered"), &ColorPicker::_html_entered);
|
||||
ClassDB::bind_method(D_METHOD("_text_type_toggled"), &ColorPicker::_text_type_toggled);
|
||||
ClassDB::bind_method(D_METHOD("_add_preset_pressed"), &ColorPicker::_add_preset_pressed);
|
||||
ClassDB::bind_method(D_METHOD("_screen_pick_pressed"), &ColorPicker::_screen_pick_pressed);
|
||||
ClassDB::bind_method(D_METHOD("_sample_draw"),&ColorPicker::_sample_draw);
|
||||
ClassDB::bind_method(D_METHOD("_hsv_draw"),&ColorPicker::_hsv_draw);
|
||||
ClassDB::bind_method(D_METHOD("_uv_input"),&ColorPicker::_uv_input);
|
||||
ClassDB::bind_method(D_METHOD("_w_input"),&ColorPicker::_w_input);
|
||||
ClassDB::bind_method(D_METHOD("_preset_input"),&ColorPicker::_preset_input);
|
||||
ClassDB::bind_method(D_METHOD("_screen_input"),&ColorPicker::_screen_input);
|
||||
ClassDB::bind_method(D_METHOD("_sample_draw"), &ColorPicker::_sample_draw);
|
||||
ClassDB::bind_method(D_METHOD("_hsv_draw"), &ColorPicker::_hsv_draw);
|
||||
ClassDB::bind_method(D_METHOD("_uv_input"), &ColorPicker::_uv_input);
|
||||
ClassDB::bind_method(D_METHOD("_w_input"), &ColorPicker::_w_input);
|
||||
ClassDB::bind_method(D_METHOD("_preset_input"), &ColorPicker::_preset_input);
|
||||
ClassDB::bind_method(D_METHOD("_screen_input"), &ColorPicker::_screen_input);
|
||||
|
||||
ADD_SIGNAL( MethodInfo("color_changed",PropertyInfo(Variant::COLOR,"color")));
|
||||
ADD_SIGNAL(MethodInfo("color_changed", PropertyInfo(Variant::COLOR, "color")));
|
||||
}
|
||||
|
||||
ColorPicker::ColorPicker() :
|
||||
BoxContainer(true) {
|
||||
ColorPicker::ColorPicker()
|
||||
: BoxContainer(true) {
|
||||
|
||||
updating=true;
|
||||
edit_alpha=true;
|
||||
updating = true;
|
||||
edit_alpha = true;
|
||||
text_is_constructor = false;
|
||||
raw_mode_enabled=false;
|
||||
changing_color=false;
|
||||
screen=NULL;
|
||||
raw_mode_enabled = false;
|
||||
changing_color = false;
|
||||
screen = NULL;
|
||||
|
||||
HBoxContainer *hb_smpl = memnew( HBoxContainer );
|
||||
btn_pick = memnew( ToolButton );
|
||||
btn_pick->connect("pressed",this,"_screen_pick_pressed");
|
||||
HBoxContainer *hb_smpl = memnew(HBoxContainer);
|
||||
btn_pick = memnew(ToolButton);
|
||||
btn_pick->connect("pressed", this, "_screen_pick_pressed");
|
||||
|
||||
sample = memnew( TextureRect );
|
||||
sample = memnew(TextureRect);
|
||||
sample->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
sample->connect("draw",this,"_sample_draw");
|
||||
sample->connect("draw", this, "_sample_draw");
|
||||
|
||||
hb_smpl->add_child(sample);
|
||||
hb_smpl->add_child(btn_pick);
|
||||
add_child(hb_smpl);
|
||||
|
||||
HBoxContainer *hb_edit = memnew( HBoxContainer );
|
||||
|
||||
uv_edit= memnew ( Control );
|
||||
|
||||
|
||||
HBoxContainer *hb_edit = memnew(HBoxContainer);
|
||||
|
||||
uv_edit = memnew(Control);
|
||||
|
||||
uv_edit->connect("gui_input", this, "_uv_input");
|
||||
uv_edit->set_mouse_filter(MOUSE_FILTER_PASS);
|
||||
uv_edit->set_custom_minimum_size(Size2 (256,256));
|
||||
Vector<Variant> args=Vector<Variant>();
|
||||
uv_edit->set_custom_minimum_size(Size2(256, 256));
|
||||
Vector<Variant> args = Vector<Variant>();
|
||||
args.push_back(0);
|
||||
args.push_back(uv_edit);
|
||||
uv_edit->connect("draw",this,"_hsv_draw",args);
|
||||
uv_edit->connect("draw", this, "_hsv_draw", args);
|
||||
|
||||
add_child(hb_edit);
|
||||
|
||||
w_edit= memnew( Control );
|
||||
w_edit = memnew(Control);
|
||||
//w_edit->set_ignore_mouse(false);
|
||||
w_edit->set_custom_minimum_size(Size2(30,256));
|
||||
w_edit->set_custom_minimum_size(Size2(30, 256));
|
||||
w_edit->connect("gui_input", this, "_w_input");
|
||||
args.clear();
|
||||
args.push_back(1);
|
||||
args.push_back(w_edit);
|
||||
w_edit->connect("draw",this,"_hsv_draw",args);
|
||||
|
||||
w_edit->connect("draw", this, "_hsv_draw", args);
|
||||
|
||||
hb_edit->add_child(uv_edit);
|
||||
hb_edit->add_child(memnew( VSeparator ));
|
||||
hb_edit->add_child(memnew(VSeparator));
|
||||
hb_edit->add_child(w_edit);
|
||||
|
||||
VBoxContainer *vbl = memnew( VBoxContainer );
|
||||
VBoxContainer *vbl = memnew(VBoxContainer);
|
||||
add_child(vbl);
|
||||
|
||||
add_child(memnew( HSeparator ));
|
||||
add_child(memnew(HSeparator));
|
||||
|
||||
VBoxContainer *vbr = memnew( VBoxContainer );
|
||||
VBoxContainer *vbr = memnew(VBoxContainer);
|
||||
add_child(vbr);
|
||||
vbr->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
const char* lt[4] = {"R","G","B","A"};
|
||||
const char *lt[4] = { "R", "G", "B", "A" };
|
||||
|
||||
for(int i=0;i<4;i++) {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
|
||||
HBoxContainer *hbc = memnew( HBoxContainer );
|
||||
HBoxContainer *hbc = memnew(HBoxContainer);
|
||||
|
||||
labels[i]=memnew( Label(lt[i]) );
|
||||
labels[i] = memnew(Label(lt[i]));
|
||||
hbc->add_child(labels[i]);
|
||||
|
||||
scroll[i]=memnew( HSlider );
|
||||
scroll[i] = memnew(HSlider);
|
||||
hbc->add_child(scroll[i]);
|
||||
|
||||
values[i]=memnew( SpinBox );
|
||||
values[i] = memnew(SpinBox);
|
||||
scroll[i]->share(values[i]);
|
||||
hbc->add_child(values[i]);
|
||||
|
||||
|
||||
scroll[i]->set_min(0);
|
||||
scroll[i]->set_page(0);
|
||||
scroll[i]->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
|
||||
scroll[i]->connect("value_changed",this,"_value_changed");
|
||||
scroll[i]->connect("value_changed", this, "_value_changed");
|
||||
|
||||
vbr->add_child(hbc);
|
||||
|
||||
}
|
||||
|
||||
HBoxContainer *hhb = memnew( HBoxContainer );
|
||||
HBoxContainer *hhb = memnew(HBoxContainer);
|
||||
|
||||
btn_mode = memnew( CheckButton );
|
||||
btn_mode = memnew(CheckButton);
|
||||
btn_mode->set_text("RAW Mode");
|
||||
btn_mode->connect("toggled", this, "set_raw_mode");
|
||||
hhb->add_child(btn_mode);
|
||||
vbr->add_child(hhb);
|
||||
text_type = memnew( Button );
|
||||
text_type = memnew(Button);
|
||||
text_type->set_flat(true);
|
||||
text_type->connect("pressed", this, "_text_type_toggled");
|
||||
hhb->add_child(text_type);
|
||||
|
||||
c_text = memnew( LineEdit );
|
||||
c_text = memnew(LineEdit);
|
||||
hhb->add_child(c_text);
|
||||
c_text->connect("text_entered",this,"_html_entered");
|
||||
c_text->connect("text_entered", this, "_html_entered");
|
||||
text_type->set_text("#");
|
||||
c_text->set_h_size_flags(SIZE_EXPAND_FILL);
|
||||
|
||||
|
||||
_update_controls();
|
||||
//_update_color();
|
||||
updating=false;
|
||||
updating = false;
|
||||
|
||||
set_pick_color(Color(1,1,1));
|
||||
set_pick_color(Color(1, 1, 1));
|
||||
|
||||
|
||||
HBoxContainer *bbc = memnew( HBoxContainer );
|
||||
HBoxContainer *bbc = memnew(HBoxContainer);
|
||||
add_child(bbc);
|
||||
|
||||
preset = memnew( TextureRect );
|
||||
preset = memnew(TextureRect);
|
||||
bbc->add_child(preset);
|
||||
//preset->set_ignore_mouse(false);
|
||||
preset->connect("gui_input", this, "_preset_input");
|
||||
|
||||
bt_add_preset = memnew ( Button );
|
||||
bt_add_preset = memnew(Button);
|
||||
bt_add_preset->set_icon(get_icon("add_preset"));
|
||||
bt_add_preset->set_tooltip("Add current color as a preset");
|
||||
bt_add_preset->connect("pressed", this, "_add_preset_pressed");
|
||||
bbc->add_child(bt_add_preset);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/////////////////
|
||||
|
||||
|
||||
void ColorPickerButton::_color_changed(const Color& p_color) {
|
||||
void ColorPickerButton::_color_changed(const Color &p_color) {
|
||||
|
||||
update();
|
||||
emit_signal("color_changed",p_color);
|
||||
emit_signal("color_changed", p_color);
|
||||
}
|
||||
|
||||
|
||||
void ColorPickerButton::pressed() {
|
||||
|
||||
Size2 ms = Size2(300, picker->get_combined_minimum_size().height+10);
|
||||
popup->set_pos(get_global_pos()-Size2(0,ms.height));
|
||||
Size2 ms = Size2(300, picker->get_combined_minimum_size().height + 10);
|
||||
popup->set_pos(get_global_pos() - Size2(0, ms.height));
|
||||
popup->set_size(ms);
|
||||
popup->popup();
|
||||
picker->set_focus_on_line_edit();
|
||||
|
||||
|
||||
}
|
||||
|
||||
void ColorPickerButton::_notification(int p_what) {
|
||||
|
||||
if (p_what == NOTIFICATION_DRAW) {
|
||||
|
||||
if (p_what==NOTIFICATION_DRAW) {
|
||||
|
||||
Ref<StyleBox> normal = get_stylebox("normal" );
|
||||
draw_rect(Rect2(normal->get_offset(),get_size()-normal->get_minimum_size()),picker->get_pick_color());
|
||||
Ref<StyleBox> normal = get_stylebox("normal");
|
||||
draw_rect(Rect2(normal->get_offset(), get_size() - normal->get_minimum_size()), picker->get_pick_color());
|
||||
}
|
||||
}
|
||||
|
||||
void ColorPickerButton::set_pick_color(const Color& p_color){
|
||||
|
||||
void ColorPickerButton::set_pick_color(const Color &p_color) {
|
||||
|
||||
picker->set_pick_color(p_color);
|
||||
update();
|
||||
emit_signal("color_changed",p_color);
|
||||
emit_signal("color_changed", p_color);
|
||||
}
|
||||
Color ColorPickerButton::get_pick_color() const{
|
||||
Color ColorPickerButton::get_pick_color() const {
|
||||
|
||||
return picker->get_pick_color();
|
||||
}
|
||||
@ -653,37 +621,35 @@ void ColorPickerButton::set_edit_alpha(bool p_show) {
|
||||
picker->set_edit_alpha(p_show);
|
||||
}
|
||||
|
||||
bool ColorPickerButton::is_editing_alpha() const{
|
||||
bool ColorPickerButton::is_editing_alpha() const {
|
||||
|
||||
return picker->is_editing_alpha();
|
||||
|
||||
}
|
||||
|
||||
ColorPicker *ColorPickerButton::get_picker() {
|
||||
return picker;
|
||||
}
|
||||
|
||||
void ColorPickerButton::_bind_methods(){
|
||||
void ColorPickerButton::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method(D_METHOD("set_pick_color","color"),&ColorPickerButton::set_pick_color);
|
||||
ClassDB::bind_method(D_METHOD("get_pick_color"),&ColorPickerButton::get_pick_color);
|
||||
ClassDB::bind_method(D_METHOD("get_picker:ColorPicker"),&ColorPickerButton::get_picker);
|
||||
ClassDB::bind_method(D_METHOD("set_edit_alpha","show"),&ColorPickerButton::set_edit_alpha);
|
||||
ClassDB::bind_method(D_METHOD("is_editing_alpha"),&ColorPickerButton::is_editing_alpha);
|
||||
ClassDB::bind_method(D_METHOD("_color_changed"),&ColorPickerButton::_color_changed);
|
||||
|
||||
ADD_SIGNAL( MethodInfo("color_changed",PropertyInfo(Variant::COLOR,"color")));
|
||||
ADD_PROPERTY( PropertyInfo(Variant::COLOR,"color"),"set_pick_color","get_pick_color") ;
|
||||
ADD_PROPERTY( PropertyInfo(Variant::BOOL,"edit_alpha"),"set_edit_alpha","is_editing_alpha") ;
|
||||
ClassDB::bind_method(D_METHOD("set_pick_color", "color"), &ColorPickerButton::set_pick_color);
|
||||
ClassDB::bind_method(D_METHOD("get_pick_color"), &ColorPickerButton::get_pick_color);
|
||||
ClassDB::bind_method(D_METHOD("get_picker:ColorPicker"), &ColorPickerButton::get_picker);
|
||||
ClassDB::bind_method(D_METHOD("set_edit_alpha", "show"), &ColorPickerButton::set_edit_alpha);
|
||||
ClassDB::bind_method(D_METHOD("is_editing_alpha"), &ColorPickerButton::is_editing_alpha);
|
||||
ClassDB::bind_method(D_METHOD("_color_changed"), &ColorPickerButton::_color_changed);
|
||||
|
||||
ADD_SIGNAL(MethodInfo("color_changed", PropertyInfo(Variant::COLOR, "color")));
|
||||
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "color"), "set_pick_color", "get_pick_color");
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "edit_alpha"), "set_edit_alpha", "is_editing_alpha");
|
||||
}
|
||||
|
||||
ColorPickerButton::ColorPickerButton() {
|
||||
|
||||
popup = memnew( PopupPanel );
|
||||
picker = memnew( ColorPicker );
|
||||
popup = memnew(PopupPanel);
|
||||
picker = memnew(ColorPicker);
|
||||
popup->add_child(picker);
|
||||
|
||||
picker->connect("color_changed",this,"_color_changed");
|
||||
picker->connect("color_changed", this, "_color_changed");
|
||||
add_child(popup);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user