Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenFlipper
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
6a4c7020
Commit
6a4c7020
authored
Feb 07, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed remaining glutSoldiSphere and glutWireSphere. refs #1
parent
5f57660e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
8 deletions
+21
-8
libs_required/ACG/Scenegraph/ManipulatorNode.cc
libs_required/ACG/Scenegraph/ManipulatorNode.cc
+9
-3
libs_required/ACG/Scenegraph/ManipulatorNode.hh
libs_required/ACG/Scenegraph/ManipulatorNode.hh
+2
-1
libs_required/ACG/Scenegraph/TrackballNode.cc
libs_required/ACG/Scenegraph/TrackballNode.cc
+10
-2
libs_required/ACG/Scenegraph/TrackballNode.hh
libs_required/ACG/Scenegraph/TrackballNode.hh
+0
-2
No files found.
libs_required/ACG/Scenegraph/ManipulatorNode.cc
View file @
6a4c7020
...
...
@@ -56,7 +56,6 @@
#include "ManipulatorNode.hh"
//== NAMESPACES ===============================================================
...
...
@@ -216,14 +215,21 @@ ManipulatorNode::draw(GLState& _state, const DrawModes::DrawMode& /* _drawMode *
// BIG wireframe sphere
if
(
sphere_clicked_
)
if
(
sphere_clicked_
)
{
_state
.
set_diffuse_color
(
select_color
*
0.6
f
);
_state
.
set_specular_color
(
select_color
*
0.0
f
);
if
(
_state
.
compatibilityProfile
())
{
ACG
::
GLState
::
shadeModel
(
GL_SMOOTH
);
glutWireSphere
(
cylinder_height_
+
4
*
cylinder_radius_
,
20
,
20
);
GLint
mode
=
0
;
glGetIntegerv
(
GL_POLYGON_MODE
,
&
mode
);
glPolygonMode
(
GL_FRONT_AND_BACK
,
GL_LINE
);
_state
.
scale
(
cylinder_height_
+
4
*
cylinder_radius_
,
cylinder_height_
+
4
*
cylinder_radius_
,
cylinder_height_
+
4
*
cylinder_radius_
);
ACG
::
GLSphere
sphere
(
20
,
20
);
sphere
.
draw_primitive
();
glPolygonMode
(
GL_FRONT_AND_BACK
,
mode
);
}
}
...
...
libs_required/ACG/Scenegraph/ManipulatorNode.hh
View file @
6a4c7020
...
...
@@ -60,12 +60,13 @@
// GMU
#include "BaseNode.hh"
#include "TransformNode.hh"
#include <ACG/GL/GLPrimitives.hh>
// Qt
#include <QEvent>
#include <QMouseEvent>
#include <ACG/GL/GLPrimitives.hh>
//== NAMESPACES ===============================================================
...
...
libs_required/ACG/Scenegraph/TrackballNode.cc
View file @
6a4c7020
...
...
@@ -55,6 +55,7 @@
#include "TrackballNode.hh"
#include <ACG/GL/GLPrimitives.hh>
//== NAMESPACES ===============================================================
...
...
@@ -70,14 +71,21 @@ namespace SceneGraph {
void
TrackballNode
::
draw
(
GLState
&
/* _state */
,
const
DrawModes
::
DrawMode
&
/* _drawMode */
)
{
// draw the trackball
// draw the track
ball
if
(
drawTrackball_
)
{
ACG
::
GLState
::
disable
(
GL_LIGHTING
);
ACG
::
GLState
::
shadeModel
(
GL_FLAT
);
glPushMatrix
();
glTranslatef
(
center
()[
0
],
center
()[
1
],
center
()[
2
]);
glutWireSphere
(
radius_
,
20
,
20
);
glScalef
(
radius_
,
radius_
,
radius_
);
GLint
mode
=
0
;
glGetIntegerv
(
GL_POLYGON_MODE
,
&
mode
);
glPolygonMode
(
GL_FRONT_AND_BACK
,
GL_LINE
);
ACG
::
GLSphere
sphere
(
20
,
20
);
sphere
.
draw_primitive
();
glPolygonMode
(
GL_FRONT_AND_BACK
,
mode
);
glPopMatrix
();
}
...
...
libs_required/ACG/Scenegraph/TrackballNode.hh
View file @
6a4c7020
...
...
@@ -61,8 +61,6 @@
#include "BaseNode.hh"
#include "TransformNode.hh"
#include <vector>
// Qt
#include <QEvent>
#include <QMouseEvent>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment