Commit 6f337793 authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Fix correctly the changes made to the draw_state interface

parent 2fde8f3e
......@@ -694,34 +694,34 @@ void Render_opengl::call_ruler(){
if (j>=Info::Render::_x_max_visible)
break;
draw_line( trace_to_render_x(j) + offset_x, offset_y ,
draw_line( trace_to_render_x(j) + offset_x, offset_y ,
trace_to_render_x(j) + offset_x, 2+offset_y, _z_ruler);
}
if (i>=Info::Render::_x_max_visible)
break;
draw_line( trace_to_render_x(i) + offset_x, offset_y-1 ,
draw_line( trace_to_render_x(i) + offset_x, offset_y-1 ,
trace_to_render_x(i) + offset_x, 4+offset_y, _z_ruler);
}
glBegin(GL_QUADS);
{
glColor4f(0.0f, 0.0f, 1.0f, 0.8f);
glVertex3d(trace_to_render_x(Info::Render::_x_min_visible) , 3, _z_ruler_under );
glVertex3d(trace_to_render_x(Info::Render::_x_min_visible) , 8, _z_ruler_under );
glVertex3d(trace_to_render_x(Info::Render::_x_max_visible) , 8, _z_ruler_under );
glVertex3d(trace_to_render_x(Info::Render::_x_max_visible) , 3, _z_ruler_under );
glVertex3d(trace_to_render_x(Info::Render::_x_min_visible), 3, _z_ruler_under );
glVertex3d(trace_to_render_x(Info::Render::_x_min_visible), 8, _z_ruler_under );
glVertex3d(trace_to_render_x(Info::Render::_x_max_visible), 8, _z_ruler_under );
glVertex3d(trace_to_render_x(Info::Render::_x_max_visible), 3, _z_ruler_under );
}
glEnd();
glBegin(GL_QUADS);
{
glColor4f(0.0, 0.0, 0.0, 1.0);
glVertex3d(trace_to_render_x(Info::Render::_x_min_visible) , 0, _z_ruler_over );
glVertex3d(trace_to_render_x(Info::Render::_x_min_visible) , 3, _z_ruler_over );
glVertex3d(trace_to_render_x(Info::Render::_x_max_visible) , 3, _z_ruler_over );
glVertex3d(trace_to_render_x(Info::Render::_x_max_visible) , 0, _z_ruler_over );
glVertex3d(trace_to_render_x(Info::Render::_x_min_visible), 0, _z_ruler_over );
glVertex3d(trace_to_render_x(Info::Render::_x_min_visible), 3, _z_ruler_over );
glVertex3d(trace_to_render_x(Info::Render::_x_max_visible), 3, _z_ruler_over );
glVertex3d(trace_to_render_x(Info::Render::_x_max_visible), 0, _z_ruler_over );
}
glEnd();
......@@ -781,8 +781,8 @@ void Render_opengl::draw_quad(Element_pos x, Element_pos y, Element_pos /*z*/, E
{
glColor3f(_red, _green, _blue);
glVertex2d(x + offset_x , y + offset_y);
glVertex2d(x + offset_x , y + h + offset_y);
glVertex2d(x + offset_x , y + offset_y);
glVertex2d(x + offset_x , y + h + offset_y);
if (Info::Render::_shaded_states){/* State color is shaded */
......@@ -803,8 +803,8 @@ void Render_opengl::draw_quad(Element_pos x, Element_pos y, Element_pos /*z*/, E
glEnd();
}
void Render_opengl::draw_triangle(Element_pos , Element_pos ,
Element_pos , Element_pos ){
void Render_opengl::draw_triangle(Element_pos, Element_pos,
Element_pos, Element_pos ){
}
void Render_opengl::draw_line(Element_pos x1, Element_pos y1, Element_pos x2, Element_pos y2, Element_pos z){
......@@ -850,11 +850,11 @@ void Render_opengl::start_draw_containers(){
glNewList(_list_containers, GL_COMPILE);/* open the list */
}
void Render_opengl::draw_container(const Element_pos , const Element_pos , const Element_pos , const Element_pos ){
void Render_opengl::draw_container(const Element_pos, const Element_pos, const Element_pos, const Element_pos ){
}
void Render_opengl::draw_container_text(const Element_pos , const Element_pos , const std::string ){
void Render_opengl::draw_container_text(const Element_pos, const Element_pos, const std::string ){
}
void Render_opengl::end_draw_containers(){
......@@ -872,7 +872,7 @@ void Render_opengl::start_draw_states(){
glNewList(_list_states, GL_COMPILE);/* open the list */
}
void Render_opengl::draw_state(const Element_pos , const Element_pos , const Element_pos , const Element_pos , const Element_col , const Element_col , const Element_col ){
void Render_opengl::draw_state(const Element_pos, const Element_pos, const Element_pos, const Element_pos, const Element_col, const EntityValue* ){
}
void Render_opengl::end_draw_states(){
......@@ -941,7 +941,7 @@ void Render_opengl::start_draw_counter(){
glNewList(_list_counters, GL_COMPILE);/* open the list */
}
void Render_opengl::draw_counter(const Element_pos , const Element_pos ){
void Render_opengl::draw_counter(const Element_pos, const Element_pos ){
}
void Render_opengl::end_draw_counter(){
......@@ -997,7 +997,7 @@ void Render_opengl::draw_stored_arrows(){
_z_arrow);/*
glTranslated( _x_state_scale*end_time,
_y_state_scale*end_height ,
_y_state_scale*end_height,
0);*/
if (start_time != end_time){
......@@ -1040,7 +1040,7 @@ void Render_opengl::draw_stored_arrows(){
glBegin(GL_LINES);
{
glVertex2d(start_time, start_height);
glVertex2d(end_time , end_height );
glVertex2d(end_time , end_height );
}
glEnd();
}
......@@ -1107,8 +1107,8 @@ void Render_opengl::draw_stored_circles(){
glBegin(GL_POLYGON);
{
for(int j = 0 ; j < NB_STEPS ; j ++){
glVertex3d(_circles[i].time + cos_table2[j]/1.2 ,
_circles[i].height + sin_table2[j]/1.2 ,
glVertex3d(_circles[i].time + cos_table2[j]/1.2,
_circles[i].height + sin_table2[j]/1.2,
0.1);
}
}
......
......@@ -379,7 +379,7 @@ public:
* \param g the green color rate of the state.
* \param b the blue color rate of the state.
*/
void draw_state(const Element_pos start , const Element_pos end, const Element_pos base, const Element_pos height, const Element_col r, const Element_col g, const Element_col b);
void draw_state(const Element_pos, const Element_pos, const Element_pos, const Element_pos, const Element_col, const EntityValue* );
/*!
* \brief Closes the state display list.
......
......@@ -221,7 +221,7 @@ void Render_svg::start_draw_states(){
}
void Render_svg::draw_state(const Element_pos , const Element_pos , const Element_pos , const Element_pos , const Element_col , const Element_col , const Element_col ){
void Render_svg::draw_state(const Element_pos, const Element_pos, const Element_pos, const Element_pos, const Element_col, const EntityValue* ){
}
void Render_svg::end_draw_states(){
......@@ -329,6 +329,3 @@ void Render_svg::set_vertical_line(Element_pos l){
void Render_svg::call_ruler(){
}
void Render_svg::draw_state(const Element_pos , const Element_pos , const Element_pos , const Element_pos , const Element_pos , const EntityValue* type){
}
......@@ -136,7 +136,7 @@ public:
* \param g the green color rate of the state.
* \param b the blue color rate of the state.
*/
void draw_state(const Element_pos start , const Element_pos end, const Element_pos base, const Element_pos height, const Element_col r, const Element_col g, const Element_col b);
void draw_state(const Element_pos, const Element_pos, const Element_pos, const Element_pos, const Element_col, const EntityValue* );
/*!
* \brief Closes the state display list.
......@@ -311,8 +311,6 @@ public:
* \brief Draw the ruler display list.
*/
void call_ruler();
void draw_state(const Element_pos , const Element_pos , const Element_pos , const Element_pos , const Element_pos , const EntityValue* type);
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment