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

Color Ramp and Curve Map added to visual shader editing.

Browse Source 
Added Color Ramp and Curve Map to shader nodes.
Fixed an issue that crashed Godot Editor right when opened.
This commit is contained in:
Juan Linietsky
2015-01-19 02:39:58 -03:00
parent e0c0aef615
commit a0511ed59a
9 changed files with 1240 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
tools/editor/plugins/shader_graph_editor_plugin.h
View File

@@ -45,6 +45,77 @@
*/
class GraphColorRampEdit : public Control {
OBJ_TYPE(GraphColorRampEdit,Control);
struct Point {
float offset;
Color color;
bool operator<(const Point& p_ponit) const {
return offset<p_ponit.offset;
}
};
PopupPanel *popup;
ColorPicker *picker;
bool grabbing;
int grabbed;
float grabbed_at;
Vector<Point> points;
void _color_changed(const Color& p_color);
protected:
void _input_event(const InputEvent& p_event);
void _notification(int p_what);
static void _bind_methods();
public:
void set_ramp(const Vector<float>& p_offsets,const Vector<Color>& p_colors);
Vector<float> get_offsets() const;
Vector<Color> get_colors() const;
virtual Size2 get_minimum_size() const;
GraphColorRampEdit();
};
class GraphCurveMapEdit : public Control {
OBJ_TYPE(GraphCurveMapEdit,Control);
struct Point {
float offset;
float height;
bool operator<(const Point& p_ponit) const {
return offset<p_ponit.offset;
}
};
bool grabbing;
int grabbed;
Vector<Point> points;
void _plot_curve(const Vector2& p_a,const Vector2& p_b,const Vector2& p_c,const Vector2& p_d);
protected:
void _input_event(const InputEvent& p_event);
void _notification(int p_what);
static void _bind_methods();
public:
void set_points(const Vector<Vector2>& p_points);
Vector<Vector2> get_points() const;
virtual Size2 get_minimum_size() const;
GraphCurveMapEdit();
};
class ShaderGraphView : public Node {
OBJ_TYPE(ShaderGraphView,Node);
@@ -95,7 +166,8 @@ class ShaderGraphView : public Node {
void _cube_edited(int p_id,Node* p_button);
void _variant_edited();
void _comment_edited(int p_id,Node* p_button);
void _color_ramp_changed(int p_id,Node* p_ramp);
void _curve_changed(int p_id,Node* p_curve);
void _sg_updated();
Map<int,GraphNode*> node_map;
protected: