Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Thomas Pitiot
CGoGN
Commits
31366e50
Commit
31366e50
authored
Aug 02, 2011
by
Maire Nicolas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Petits changement dans l'interface de "clipping".
parent
d3ed36fb
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
292 additions
and
384 deletions
+292
-384
Apps/Examples/clipping.cpp
Apps/Examples/clipping.cpp
+15
-3
Apps/Examples/clipping.ui
Apps/Examples/clipping.ui
+277
-381
No files found.
Apps/Examples/clipping.cpp
View file @
31366e50
...
...
@@ -278,7 +278,7 @@ void Clipping::initGUI()
setCallBack
(
dock
.
spinBox_GridResolution
,
SIGNAL
(
valueChanged
(
int
)),
SLOT
(
slot_spinBox_GridResolution
(
int
)));
setCallBack
(
dock
.
pushButton_changePlanesColor
,
SIGNAL
(
clicked
()),
SLOT
(
slot_pushButton_changePlanesColor
()));
setCallBack
(
dock
.
compileButton
,
SIGNAL
(
clicked
()),
SLOT
(
button_compile
())
);
setCallBack
(
dock
.
compileButton
,
SIGNAL
(
clicked
()),
SLOT
(
button_compile
()));
dock
.
vertexEdit
->
setPlainText
(
QString
(
m_shader
->
getVertexShaderSrc
()));
dock
.
fragmentEdit
->
setPlainText
(
QString
(
m_shader
->
getFragmentShaderSrc
()));
...
...
@@ -296,7 +296,7 @@ void Clipping::initGUI()
unsigned
int
spheresPrecision1
,
spheresPrecision2
;
m_sphereDrawable
->
getPrecisionDrawing
(
spheresPrecision1
,
spheresPrecision2
);
dock
.
spinBox_
Grid
Resolution
->
setValue
(
spheresPrecision1
);
dock
.
spinBox_
Sphere
Resolution
->
setValue
(
spheresPrecision1
);
...
...
@@ -408,7 +408,7 @@ void Clipping::cb_initGL()
m_planeDrawable
->
updatePrecisionDrawing
(
5
);
m_sphereDrawable
=
new
Utils
::
IcoSphere
;
m_sphereDrawable
->
setColor
(
Geom
::
Vec4f
(
0.0
,
0.4
,
1.0
,
1.0
));
m_sphereDrawable
->
updatePrecisionDrawing
(
3
);
m_sphereDrawable
->
updatePrecisionDrawing
(
1
);
// setup clipping picking frame
m_frameManipulator
=
new
Utils
::
FrameManipulator
();
...
...
@@ -458,9 +458,21 @@ void Clipping::cb_redraw()
// Display clipping shapes
for
(
size_t
i
=
0
;
i
<
m_pickablePlanes
.
size
();
i
++
)
{
if
(
m_pickablePlanes
[
i
]
==
m_lastPickedObject
)
glLineWidth
(
5.0
);
else
glLineWidth
(
2.0
);
m_pickablePlanes
[
i
]
->
draw
();
}
for
(
size_t
i
=
0
;
i
<
m_pickableSpheres
.
size
();
i
++
)
{
if
(
m_pickableSpheres
[
i
]
==
m_lastPickedObject
)
glLineWidth
(
5.0
);
else
glLineWidth
(
2.0
);
m_pickableSpheres
[
i
]
->
draw
();
}
// Display picking frame
if
(
m_lastPickedObject
)
...
...
Apps/Examples/clipping.ui
View file @
31366e50
This diff is collapsed.
Click to expand it.
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