Skip to content
Snippets Groups Projects
Commit fba889b2 authored by Jan Möbius's avatar Jan Möbius
Browse files

Replaced the glutSolidSphere in Trackball Node with own implementation

parent 02048eaa
No related branches found
No related tags found
1 merge request!133Removed glut
......@@ -55,7 +55,6 @@
#if defined(ARCH_DARWIN)
#include <glut.h>
#include <OpenGL/gl.h>
#elif defined(WIN32)
......@@ -65,11 +64,9 @@
// but a lot with static linking
// # define GLEW_STATIC 1
#include <gl/glew.h>
#include <gl/glut.h>
#else
#include <GL/glut.h>
#include <GL/gl.h>
#endif
......
......@@ -55,6 +55,7 @@
#include "TrackballNode.hh"
#include <ACG/GL/GLPrimitives.hh>
//== NAMESPACES ===============================================================
......@@ -77,7 +78,17 @@ TrackballNode::draw(GLState& /* _state */ , const DrawModes::DrawMode& /* _drawM
ACG::GLState::shadeModel( GL_FLAT );
glPushMatrix();
glTranslatef(center()[0], center()[1], center()[2]);
glutWireSphere(radius_, 20, 20);
glScalef(radius_,radius_,radius_);
ACG::GLSphere sphere(20, 20);
sphere.draw_primitive();
std::cerr << "Untested code path after replacement of glutWireSphere! Please report TrackballNode:85 if that path works" << std::endl;
// glutWireSphere(radius_, 20, 20);
std::cerr << "Sphere 4" << std::endl;
glPopMatrix();
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment