Commit f17bf6fa authored by Sébastien Timmermans's avatar Sébastien Timmermans
Browse files

[ErrMsg][Dirdyn][Fix] RT catch error of incorrect inline name

parent 49dfae60
......@@ -214,18 +214,30 @@ int init_open_gl(Realtime_visu *visu, MbsData *mbs_data, int nb_models, int *nb_
}
// send number of models to child
err =opengl_win_send_pipe_msg(std::to_string(nb_models));
err = opengl_win_send_pipe_msg(std::to_string(nb_models));
if (err < 0) // Error management
{
return err;
}
opengl_win_continue_pipe_answer(&err);
if (err < 0) // Error management
{
return err;
}
// send .mbs files to child
for (int i = 0; i < nb_models; i++)
{
opengl_win_send_pipe_msg(mbs_file[i]);
opengl_win_continue_pipe_answer(&err);
err = opengl_win_send_pipe_msg(mbs_file[i]);
if (err < 0) // Error management
{
return err;
}
err = opengl_win_continue_pipe_answer(&err);
if (err < 0) // Error management
{
return err;
}
}
// send number of joins to child
......@@ -618,7 +630,7 @@ int joints_view_open_gl(Realtime_visu *visu, int nb_models, int *nb_q, double **
// 3D window closed
if (world_3d == NULL)
{
return;
return 0;
}
// check 3D window to close it
......@@ -626,7 +638,7 @@ int joints_view_open_gl(Realtime_visu *visu, int nb_models, int *nb_q, double **
{
delete world_3d;
visu->visu_class = NULL;
return;
return 0;
}
// update world 3D timing
......
......@@ -56,6 +56,11 @@ namespace OpenGLMbs {
if (!ext_cad.compare("obj"))
{
load_success = LoadOBJ(cad_file, dir_cad);
if (!load_success)
{
std::cout << "CAD file loading warning: " << cad_file << " .obj is not found !" << std::endl;
return;
}
}
// VRML file
else if (!ext_cad.compare("wrl"))
......@@ -65,11 +70,21 @@ namespace OpenGLMbs {
if (load_success) {
load_success = loader.PushVertices(temp_vertices, temp_colors) != 0;
}
else
{
std::cout << "CAD file loading warning: " << cad_file << " .wrl is not found !" << std::endl;
return;
}
}
// STL file
else if (!ext_cad.compare("stl"))
{
load_success = LoadSTL(cad_file, color);
if (!load_success)
{
std::cout << "CAD file loading warning: " << cad_file << " .stl is not found !" << std::endl;
return;
}
}
else // extension not known
{
......
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