Skip to content

Fix copy-paste errors in compile_shaders() error messages and comments #9393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RajdeepKushwaha5 wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −6
Open

Fix copy-paste errors in compile_shaders() error messages and comments #9393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Basic_viewer/include/CGAL/Qt/Basic_viewer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,15 +986,14 @@ class Basic_viewer : public CGAL::QGLViewer
if (!rendering_program_sphere.addShader(geometry_shader_sphere))
{ std::cerr << "Adding geometry shader for sphere FAILED" << std::endl;}
if (!rendering_program_sphere.addShader(fragment_shader_sphere))
{ std::cerr << "Adding fragment shader for clipping plane FAILED" << std::endl; }
{ std::cerr << "Adding fragment shader for sphere FAILED" << std::endl; }
if (!rendering_program_sphere.link())
{ std::cerr << "Linking Program for sphere FAILED" << std::endl; }
}

// Cylinder shader
if (isOpenGL_4_3())
{
// clipping plane shader
source_ = VERTEX_SOURCE_SHAPE;

QOpenGLShader *vertex_shader_cylinder = new QOpenGLShader(QOpenGLShader::Vertex);
Expand All @@ -1019,7 +1018,7 @@ class Basic_viewer : public CGAL::QGLViewer
if (!rendering_program_cylinder.addShader(geometry_shader_cylinder))
{ std::cerr << "Adding geometry shader for cylinder FAILED" << std::endl;}
if (!rendering_program_cylinder.addShader(fragment_shader_cylinder))
{ std::cerr << "Adding fragment shader for clipping plane FAILED" << std::endl; }
{ std::cerr << "Adding fragment shader for cylinder FAILED" << std::endl; }
if (!rendering_program_cylinder.link())
{ std::cerr << "Linking Program for cylinder FAILED" << std::endl; }
}
Expand Down Expand Up @@ -1051,12 +1050,12 @@ class Basic_viewer : public CGAL::QGLViewer
if (!rendering_program_normal.addShader(geometry_shader_normal))
{ std::cerr << "Adding geometry shader for normal FAILED" << std::endl;}
if (!rendering_program_normal.addShader(fragment_shader_normal))
{ std::cerr << "Adding fragment shader for clipping plane FAILED" << std::endl; }
{ std::cerr << "Adding fragment shader for normal FAILED" << std::endl; }
if (!rendering_program_normal.link())
{ std::cerr << "Linking Program for normal FAILED" << std::endl; }
}

// Normal shader
// Triangle shader
if (isOpenGL_4_3())
{
source_ = VERTEX_SOURCE_TRIANGLE;
Expand All @@ -1083,7 +1082,7 @@ class Basic_viewer : public CGAL::QGLViewer
if (!rendering_program_triangle.addShader(geometry_shader_triangle))
{ std::cerr << "Adding geometry shader for triangle FAILED" << std::endl;}
if (!rendering_program_triangle.addShader(fragment_shader_triangle))
{ std::cerr << "Adding fragment shader for clipping plane FAILED" << std::endl; }
{ std::cerr << "Adding fragment shader for triangle FAILED" << std::endl; }
if (!rendering_program_triangle.link())
{ std::cerr << "Linking Program for triangle FAILED" << std::endl; }
}
Expand Down
Loading