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

Fix some warnings about misleading indentation

Browse source
This commit is contained in:
Johan Manuel 2016-07-26 15:04:54 +02:00
parent 046f94d3ac
commit 67b29e3b9e
4 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/math/triangulate.cpp
View file

@ -157,7 +157,10 @@ bool Triangulate::triangulate(const Vector<Vector2> &contour,Vector<int> &result
m++; m++;
/* remove v from remaining polygon */ /* remove v from remaining polygon */
for(s=v,t=v+1;t<nv;s++,t++) V[s] = V[t]; nv--; for(s=v,t=v+1;t<nv;s++,t++)
V[s] = V[t];
nv--;
/* resest error detection counter */ /* resest error detection counter */
count = 2*nv; count = 2*nv;

4
drivers/pulseaudio/audio_driver_pulseaudio.cpp
View file

@ -175,8 +175,8 @@ void AudioDriverPulseAudio::finish() {
exit_thread = true; exit_thread = true;
Thread::wait_to_finish(thread); Thread::wait_to_finish(thread);
if (pulse) if (pulse)
pa_simple_free(pulse); pa_simple_free(pulse);
if (samples_in) { if (samples_in) {
memdelete_arr(samples_in); memdelete_arr(samples_in);

4
modules/gdscript/gd_script.h
View file

@ -330,8 +330,8 @@ public:
virtual Vector<StackInfo> debug_get_current_stack_info() { virtual Vector<StackInfo> debug_get_current_stack_info() {
if (Thread::get_main_ID()!=Thread::get_caller_ID()) if (Thread::get_main_ID()!=Thread::get_caller_ID())
return Vector<StackInfo>(); return Vector<StackInfo>();
Vector<StackInfo> csi; Vector<StackInfo> csi;
csi.resize(_debug_call_stack_pos); csi.resize(_debug_call_stack_pos);

17
scene/gui/color_picker.cpp
View file

@ -41,13 +41,13 @@ void update_material(Ref<CanvasItemMaterial>mat,const Color& p_color,float h,flo
if (!sdr.is_valid()) if (!sdr.is_valid())
return; return;
mat->set_shader_param("R",p_color.r); mat->set_shader_param("R",p_color.r);
mat->set_shader_param("G",p_color.g); mat->set_shader_param("G",p_color.g);
mat->set_shader_param("B",p_color.b); mat->set_shader_param("B",p_color.b);
mat->set_shader_param("H",h); mat->set_shader_param("H",h);
mat->set_shader_param("S",s); mat->set_shader_param("S",s);
mat->set_shader_param("V",v); mat->set_shader_param("V",v);
mat->set_shader_param("A",p_color.a); mat->set_shader_param("A",p_color.a);
} }
void ColorPicker::_notification(int p_what) { void ColorPicker::_notification(int p_what) {
@ -397,9 +397,10 @@ void ColorPicker::_screen_input(const InputEvent &ev)
if (!r->get_rect().has_point(Point2(mev.global_x,mev.global_y))) if (!r->get_rect().has_point(Point2(mev.global_x,mev.global_y)))
return; return;
Image img =r->get_screen_capture(); Image img =r->get_screen_capture();
if (!img.empty()) if (!img.empty()) {
last_capture=img; last_capture=img;
r->queue_screen_capture(); r->queue_screen_capture();
}
if (!last_capture.empty()) if (!last_capture.empty())
set_color(last_capture.get_pixel(mev.global_x,mev.global_y)); set_color(last_capture.get_pixel(mev.global_x,mev.global_y));
} }