mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=2501
This commit is contained in:
parent
9d7a60931d
commit
243a718db2
14
api/reduce.C
14
api/reduce.C
|
@ -794,15 +794,15 @@ void REDUCED_ARRAY::draw_labels() {
|
||||||
double aspect_ratio = 4.0/3.0;
|
double aspect_ratio = 4.0/3.0;
|
||||||
if ((double)h*aspect_ratio > (double)w)
|
if ((double)h*aspect_ratio > (double)w)
|
||||||
{
|
{
|
||||||
model[1]*=1.0f/((w/aspect_ratio)/h);
|
model[1]*=1.0f/(((double)w/aspect_ratio)/(double)h);
|
||||||
model[5]*=1.0f/((w/aspect_ratio)/h);
|
model[5]*=1.0f/(((double)w/aspect_ratio)/(double)h);
|
||||||
model[9]*=1.0f/((w/aspect_ratio)/h);
|
model[9]*=1.0f/(((double)w/aspect_ratio)/(double)h);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
model[0]*=1.0f/((h*aspect_ratio)/w);
|
model[0]*=1.0f/(((double)h*aspect_ratio)/(double)w);
|
||||||
model[4]*=1.0f/((h*aspect_ratio)/w);
|
model[4]*=1.0f/(((double)h*aspect_ratio)/(double)w);
|
||||||
model[8]*=1.0f/((h*aspect_ratio)/w);
|
model[8]*=1.0f/(((double)h*aspect_ratio)/(double)w);
|
||||||
}
|
}
|
||||||
|
|
||||||
//project to ortho coordinates
|
//project to ortho coordinates
|
||||||
|
@ -819,7 +819,7 @@ void REDUCED_ARRAY::draw_labels() {
|
||||||
model, proj, viewport,x_pos
|
model, proj, viewport,x_pos
|
||||||
);
|
);
|
||||||
|
|
||||||
get_2d_positions(draw_pos[0]+draw_size[0],draw_pos[1],draw_pos[2]+draw_size[2],
|
get_2d_positions(draw_pos[0]+draw_size[0]+.2f,draw_pos[1]+.6f,draw_pos[2]+draw_size[2]-.4f,
|
||||||
model, proj, viewport,p_pos
|
model, proj, viewport,p_pos
|
||||||
);
|
);
|
||||||
glPopMatrix();
|
glPopMatrix();
|
||||||
|
|
|
@ -6884,3 +6884,8 @@ David 17 Oct 2003
|
||||||
error_numbers.h
|
error_numbers.h
|
||||||
sched/
|
sched/
|
||||||
handle_request.C
|
handle_request.C
|
||||||
|
|
||||||
|
Oliver 17 Oct 2003
|
||||||
|
- small label coord tweak
|
||||||
|
api/
|
||||||
|
reduce.c
|
Loading…
Reference in New Issue