asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Add missing icons, also make MSVC2010 happy

Browse source
This commit is contained in:
Mariano Javier Suligoy 2015-08-30 19:37:23 -03:00
parent c688b55019
commit 680402cebf
3 changed files with 184 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/gui/spin_box.cpp
View file

@ -125,7 +125,7 @@ void SpinBox::_input_event(const InputEvent& p_event) {
if (drag.enabled) {
float diff_y = drag.mouse_pos.y - cpos.y;
diff_y=pow(ABS(diff_y),1.8)*SGN(diff_y);
diff_y=pow((float)ABS(diff_y),(float)1.8)*SGN(diff_y);
diff_y*=0.1;
drag.mouse_pos=cpos;

14
scene/gui/tree.cpp
View file

@ -950,13 +950,13 @@ int Tree::draw_item(const Point2i& p_pos,const Point2& p_draw_ofs, const Size2&
Point2i guide_from;
bool skip=(p_item==root && hide_root);
bool skip=(p_item==root && hide_root);
// printf("skip (%p == %p && %i) %i\n",p_item,root,hide_root,skip);
if (!skip && (p_pos.y+label_h-cache.offset.y)>0) {
// printf("entering\n");
// printf("entering\n");
int height=label_h;
@ -2070,7 +2070,7 @@ void Tree::_input_event(InputEvent p_event) {
TreeItem::Cell &c=popup_edited_item->cells[popup_edited_item_col];
float diff_y = -b.relative_y;
diff_y=pow(ABS(diff_y),1.8)*SGN(diff_y);
diff_y=pow((float)ABS(diff_y),(float)1.8)*SGN(diff_y);
diff_y*=0.1;
range_drag_base=CLAMP(range_drag_base + c.step * diff_y, c.min, c.max);
@ -2645,7 +2645,7 @@ void Tree::item_deselected(int p_column,TreeItem *p_item) {
void Tree::set_select_mode(SelectMode p_mode) {
select_mode=p_mode;
select_mode=p_mode;
}
void Tree::clear() {
@ -2675,8 +2675,8 @@ void Tree::set_hide_root(bool p_enabled) {
hide_root=p_enabled;
update();
hide_root=p_enabled;
update();
}
void Tree::set_column_min_width(int p_column,int p_min_width) {
@ -2694,7 +2694,7 @@ void Tree::set_column_expand(int p_column,bool p_expand) {
ERR_FAIL_INDEX(p_column,columns.size());
columns[p_column].expand=p_expand;
columns[p_column].expand=p_expand;
update();
}

15
tools/editor/plugins/shader_graph_editor_plugin.cpp
View file

@ -2413,12 +2413,21 @@ void ShaderGraphView::_create_node(int p_id) {
Array colors;
colors.push_back("Color");
colors.push_back("LightColor");
colors.push_back("Light");
colors.push_back("Diffuse");
colors.push_back("Specular");
colors.push_back("Emmision");
Array reals;
reals.push_back("Alpha");
reals.push_back("NormapMapDepth");
reals.push_back("DiffuseAlpha");
reals.push_back("NormalMapDepth");
reals.push_back("SpecExp");
reals.push_back("Glow");
reals.push_back("ShadeParam");
reals.push_back("SpecularExp");
reals.push_back("LightAlpha");
reals.push_back("PointSize");
reals.push_back("Discard");
int idx=0;
for (List<ShaderGraph::SlotInfo>::Element *E=si.front();E;E=E->next()) {
@ -2739,10 +2748,8 @@ const char* ShaderGraphEditor::node_names[ShaderGraph::NODE_TYPE_MAX]={
ShaderGraphEditor::ShaderGraphEditor(bool p_2d) {
_2d=p_2d;
HBoxContainer *hbc = memnew( HBoxContainer );
popup = memnew( PopupMenu );
hbc->add_child(popup);
add_child(hbc);
add_child(popup);
tabs = memnew(TabContainer);