godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +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

160
scene/gui/range.cpp
View File

@@ -28,20 +28,18 @@
/*************************************************************************/
#include "range.h"
void Range::_value_changed_notify() {
_value_changed(shared->val);
emit_signal("value_changed",shared->val);
emit_signal("value_changed", shared->val);
update();
_change_notify("range/value");
}
void Range::Shared::emit_value_changed() {
for (Set<Range*>::Element *E=owners.front();E;E=E->next()) {
Range *r=E->get();
for (Set<Range *>::Element *E = owners.front(); E; E = E->next()) {
Range *r = E->get();
if (!r->is_inside_tree())
continue;
r->_value_changed_notify();
@@ -50,65 +48,62 @@ void Range::Shared::emit_value_changed() {
void Range::_changed_notify(const char *p_what) {
emit_signal("changed",shared->val);
emit_signal("changed", shared->val);
update();
_change_notify(p_what);
}
void Range::Shared::emit_changed(const char *p_what) {
for (Set<Range*>::Element *E=owners.front();E;E=E->next()) {
Range *r=E->get();
for (Set<Range *>::Element *E = owners.front(); E; E = E->next()) {
Range *r = E->get();
if (!r->is_inside_tree())
continue;
r->_changed_notify(p_what);
}
}
void Range::set_val(double p_val) {
if(_rounded_values){
if (_rounded_values) {
p_val = Math::round(p_val);
}
if (p_val>shared->max-shared->page)
p_val=shared->max-shared->page;
if (p_val > shared->max - shared->page)
p_val = shared->max - shared->page;
if (p_val<shared->min)
p_val=shared->min;
if (p_val < shared->min)
p_val = shared->min;
if (shared->val==p_val)
if (shared->val == p_val)
return;
shared->val=p_val;
shared->val = p_val;
shared->emit_value_changed();
}
void Range::set_min(double p_min) {
shared->min=p_min;
shared->min = p_min;
set_val(shared->val);
shared->emit_changed("range/min");
}
void Range::set_max(double p_max) {
shared->max=p_max;
shared->max = p_max;
set_val(shared->val);
shared->emit_changed("range/max");
}
void Range::set_step(double p_step) {
shared->step=p_step;
shared->step = p_step;
shared->emit_changed("range/step");
}
void Range::set_page(double p_page) {
shared->page=p_page;
shared->page = p_page;
set_val(shared->val);
shared->emit_changed("range/page");
@@ -139,11 +134,11 @@ void Range::set_unit_value(double p_value) {
double v;
if (shared->exp_unit_value && get_min()>0) {
if (shared->exp_unit_value && get_min() > 0) {
double exp_min = Math::log(get_min())/Math::log(2);
double exp_max = Math::log(get_max())/Math::log(2);
v = Math::pow(2,exp_min+(exp_max-exp_min)*p_value);
double exp_min = Math::log(get_min()) / Math::log(2);
double exp_max = Math::log(get_max()) / Math::log(2);
v = Math::pow(2, exp_min + (exp_max - exp_min) * p_value);
} else {
double percent = (get_max() - get_min()) * p_value;
@@ -154,15 +149,15 @@ void Range::set_unit_value(double p_value) {
v = percent + get_min();
}
}
set_val( v );
set_val(v);
}
double Range::get_unit_value() const {
if (shared->exp_unit_value && get_min()>0) {
if (shared->exp_unit_value && get_min() > 0) {
double exp_min = Math::log(get_min())/Math::log(2);
double exp_max = Math::log(get_max())/Math::log(2);
double v = Math::log(get_val())/Math::log(2);
double exp_min = Math::log(get_min()) / Math::log(2);
double exp_max = Math::log(get_max()) / Math::log(2);
double v = Math::log(get_val()) / Math::log(2);
return (v - exp_min) / (exp_max - exp_min);
@@ -174,7 +169,7 @@ double Range::get_unit_value() const {
void Range::_share(Node *p_range) {
Range * r = p_range->cast_to<Range>();
Range *r = p_range->cast_to<Range>();
ERR_FAIL_COND(!r);
share(r);
}
@@ -190,71 +185,69 @@ void Range::share(Range *p_range) {
void Range::unshare() {
Shared * nshared = memnew(Shared);
nshared->min=shared->min;
nshared->max=shared->max;
nshared->val=shared->val;
nshared->step=shared->step;
nshared->page=shared->page;
Shared *nshared = memnew(Shared);
nshared->min = shared->min;
nshared->max = shared->max;
nshared->val = shared->val;
nshared->step = shared->step;
nshared->page = shared->page;
_unref_shared();
_ref_shared(nshared);
}
void Range::_ref_shared(Shared *p_shared) {
if (shared && p_shared==shared)
if (shared && p_shared == shared)
return;
_unref_shared();
shared=p_shared;
shared = p_shared;
shared->owners.insert(this);
}
void Range::_unref_shared() {
shared->owners.erase(this);
if (shared->owners.size()==0) {
if (shared->owners.size() == 0) {
memdelete(shared);
shared=NULL;
shared = NULL;
}
}
void Range::_bind_methods() {
ObjectTypeDB::bind_method(_MD("get_val"),&Range::get_val);
ObjectTypeDB::bind_method(_MD("get_value"),&Range::get_val);
ObjectTypeDB::bind_method(_MD("get_min"),&Range::get_min);
ObjectTypeDB::bind_method(_MD("get_max"),&Range::get_max);
ObjectTypeDB::bind_method(_MD("get_step"),&Range::get_step);
ObjectTypeDB::bind_method(_MD("get_page"),&Range::get_page);
ObjectTypeDB::bind_method(_MD("get_unit_value"),&Range::get_unit_value);
ObjectTypeDB::bind_method(_MD("set_val","value"),&Range::set_val);
ObjectTypeDB::bind_method(_MD("set_value","value"),&Range::set_val);
ObjectTypeDB::bind_method(_MD("set_min","minimum"),&Range::set_min);
ObjectTypeDB::bind_method(_MD("set_max","maximum"),&Range::set_max);
ObjectTypeDB::bind_method(_MD("set_step","step"),&Range::set_step);
ObjectTypeDB::bind_method(_MD("set_page","pagesize"),&Range::set_page);
ObjectTypeDB::bind_method(_MD("set_unit_value","value"),&Range::set_unit_value);
ObjectTypeDB::bind_method(_MD("set_rounded_values","enabled"),&Range::set_rounded_values);
ObjectTypeDB::bind_method(_MD("is_rounded_values"),&Range::is_rounded_values);
ObjectTypeDB::bind_method(_MD("set_exp_unit_value","enabled"),&Range::set_exp_unit_value);
ObjectTypeDB::bind_method(_MD("is_unit_value_exp"),&Range::is_unit_value_exp);
ObjectTypeDB::bind_method(_MD("get_val"), &Range::get_val);
ObjectTypeDB::bind_method(_MD("get_value"), &Range::get_val);
ObjectTypeDB::bind_method(_MD("get_min"), &Range::get_min);
ObjectTypeDB::bind_method(_MD("get_max"), &Range::get_max);
ObjectTypeDB::bind_method(_MD("get_step"), &Range::get_step);
ObjectTypeDB::bind_method(_MD("get_page"), &Range::get_page);
ObjectTypeDB::bind_method(_MD("get_unit_value"), &Range::get_unit_value);
ObjectTypeDB::bind_method(_MD("set_val", "value"), &Range::set_val);
ObjectTypeDB::bind_method(_MD("set_value", "value"), &Range::set_val);
ObjectTypeDB::bind_method(_MD("set_min", "minimum"), &Range::set_min);
ObjectTypeDB::bind_method(_MD("set_max", "maximum"), &Range::set_max);
ObjectTypeDB::bind_method(_MD("set_step", "step"), &Range::set_step);
ObjectTypeDB::bind_method(_MD("set_page", "pagesize"), &Range::set_page);
ObjectTypeDB::bind_method(_MD("set_unit_value", "value"), &Range::set_unit_value);
ObjectTypeDB::bind_method(_MD("set_rounded_values", "enabled"), &Range::set_rounded_values);
ObjectTypeDB::bind_method(_MD("is_rounded_values"), &Range::is_rounded_values);
ObjectTypeDB::bind_method(_MD("set_exp_unit_value", "enabled"), &Range::set_exp_unit_value);
ObjectTypeDB::bind_method(_MD("is_unit_value_exp"), &Range::is_unit_value_exp);
ObjectTypeDB::bind_method(_MD("share","with"),&Range::_share);
ObjectTypeDB::bind_method(_MD("unshare"),&Range::unshare);
ObjectTypeDB::bind_method(_MD("share", "with"), &Range::_share);
ObjectTypeDB::bind_method(_MD("unshare"), &Range::unshare);
ADD_SIGNAL( MethodInfo("value_changed", PropertyInfo(Variant::REAL,"value")));
ADD_SIGNAL( MethodInfo("changed"));
ADD_PROPERTY( PropertyInfo( Variant::REAL, "range/min" ), _SCS("set_min"), _SCS("get_min") );
ADD_PROPERTY( PropertyInfo( Variant::REAL, "range/max" ), _SCS("set_max"), _SCS("get_max") );
ADD_PROPERTY( PropertyInfo( Variant::REAL, "range/step" ), _SCS("set_step"), _SCS("get_step") );
ADD_PROPERTY( PropertyInfo( Variant::REAL, "range/page" ), _SCS("set_page"), _SCS("get_page") );
ADD_PROPERTY( PropertyInfo( Variant::REAL, "range/value" ), _SCS("set_val"), _SCS("get_val") );
ADD_PROPERTY( PropertyInfo( Variant::BOOL, "range/exp_edit" ), _SCS("set_exp_unit_value"), _SCS("is_unit_value_exp") );
ADD_PROPERTY( PropertyInfo( Variant::BOOL, "range/rounded" ), _SCS("set_rounded_values"), _SCS("is_rounded_values") );
ADD_SIGNAL(MethodInfo("value_changed", PropertyInfo(Variant::REAL, "value")));
ADD_SIGNAL(MethodInfo("changed"));
ADD_PROPERTY(PropertyInfo(Variant::REAL, "range/min"), _SCS("set_min"), _SCS("get_min"));
ADD_PROPERTY(PropertyInfo(Variant::REAL, "range/max"), _SCS("set_max"), _SCS("get_max"));
ADD_PROPERTY(PropertyInfo(Variant::REAL, "range/step"), _SCS("set_step"), _SCS("get_step"));
ADD_PROPERTY(PropertyInfo(Variant::REAL, "range/page"), _SCS("set_page"), _SCS("get_page"));
ADD_PROPERTY(PropertyInfo(Variant::REAL, "range/value"), _SCS("set_val"), _SCS("get_val"));
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "range/exp_edit"), _SCS("set_exp_unit_value"), _SCS("is_unit_value_exp"));
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "range/rounded"), _SCS("set_rounded_values"), _SCS("is_rounded_values"));
}
void Range::set_rounded_values(bool p_enable) {
@@ -269,7 +262,7 @@ bool Range::is_rounded_values() const {
void Range::set_exp_unit_value(bool p_enable) {
shared->exp_unit_value=p_enable;
shared->exp_unit_value = p_enable;
}
bool Range::is_unit_value_exp() const {
@@ -277,25 +270,20 @@ bool Range::is_unit_value_exp() const {
return shared->exp_unit_value;
}
Range::Range()
{
Range::Range() {
shared = memnew(Shared);
shared->min=0;
shared->max=100;
shared->val=
shared->step=1;
shared->page=0;
shared->min = 0;
shared->max = 100;
shared->val =
shared->step = 1;
shared->page = 0;
shared->owners.insert(this);
shared->exp_unit_value=false;
shared->exp_unit_value = false;
_rounded_values = false;
}
Range::~Range() {
_unref_shared();
}