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
CGoGN
CGoGN
Commits
6e1f65e5
Commit
6e1f65e5
authored
Apr 13, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix lineWidth & fixed Size of window
parent
dc66829a
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
197 additions
and
278 deletions
+197
-278
CGoGN/src/Utils/Shaders/shaderBoldColorLines.cpp
CGoGN/src/Utils/Shaders/shaderBoldColorLines.cpp
+2
-2
CGoGN/src/Utils/Shaders/shaderBoldLines.cpp
CGoGN/src/Utils/Shaders/shaderBoldLines.cpp
+2
-2
SCHNApps/include/schnapps.h
SCHNApps/include/schnapps.h
+1
-1
SCHNApps/src/schnapps.cpp
SCHNApps/src/schnapps.cpp
+1
-0
SCHNApps/src/view.cpp
SCHNApps/src/view.cpp
+191
-273
No files found.
CGoGN/src/Utils/Shaders/shaderBoldColorLines.cpp
View file @
6e1f65e5
...
...
@@ -88,7 +88,7 @@ void ShaderBoldColorLines::setLineWidth(float pix)
{
glm
::
i32vec4
viewport
;
glGetIntegerv
(
GL_VIEWPORT
,
&
(
viewport
[
0
]));
float
lw
=
float
(
(
0.5
*
pix
)
/
double
(
viewport
[
2
]));
float
lw
=
float
(
double
(
pix
)
/
double
(
viewport
[
2
]));
bind
();
glUniform1f
(
*
m_uniform_lineWidth
,
lw
);
...
...
@@ -101,7 +101,7 @@ void ShaderBoldColorLines::updatePixelWidth()
{
glm
::
i32vec4
viewport
;
glGetIntegerv
(
GL_VIEWPORT
,
&
(
viewport
[
0
]));
float
lw
=
float
(
(
0.5
*
m_pixWidth
)
/
double
(
viewport
[
2
]));
float
lw
=
float
(
double
(
m_pixWidth
)
/
double
(
viewport
[
2
]));
bind
();
glUniform1f
(
*
m_uniform_lineWidth
,
lw
);
...
...
CGoGN/src/Utils/Shaders/shaderBoldLines.cpp
View file @
6e1f65e5
...
...
@@ -86,7 +86,7 @@ void ShaderBoldLines::setLineWidth(float pix)
{
glm
::
i32vec4
viewport
;
glGetIntegerv
(
GL_VIEWPORT
,
&
(
viewport
[
0
]));
float
lw
=
float
(
(
0.5
*
pix
)
/
double
(
viewport
[
2
]));
float
lw
=
float
(
double
(
pix
)
/
double
(
viewport
[
2
]));
bind
();
glUniform1f
(
*
m_uniform_lineWidth
,
lw
);
...
...
@@ -99,7 +99,7 @@ void ShaderBoldLines::updatePixelWidth()
{
glm
::
i32vec4
viewport
;
glGetIntegerv
(
GL_VIEWPORT
,
&
(
viewport
[
0
]));
float
lw
=
float
(
(
0.5
*
m_pixWidth
)
/
double
(
viewport
[
2
]));
float
lw
=
float
(
double
(
m_pixWidth
)
/
double
(
viewport
[
2
]));
bind
();
glUniform1f
(
*
m_uniform_lineWidth
,
lw
);
...
...
SCHNApps/include/schnapps.h
View file @
6e1f65e5
...
...
@@ -153,7 +153,7 @@ public slots:
QString
saveFileDialog
(
const
QString
&
title
,
const
QString
&
dir
=
QString
(),
const
QString
&
filter
=
QString
());
void
setWindowSize
(
int
w
,
int
h
)
{
this
->
setFixedS
ize
(
w
,
h
);
}
void
setWindowSize
(
int
w
,
int
h
)
{
this
->
res
ize
(
w
,
h
);
}
private
slots
:
void
loadPythonScriptFromFileDialog
();
...
...
SCHNApps/src/schnapps.cpp
View file @
6e1f65e5
...
...
@@ -118,6 +118,7 @@ SCHNApps::SCHNApps(const QString& appPath, PythonQtObjectPtr& pythonContext, Pyt
// create & setup central widget (views)
m_centralLayout = new QVBoxLayout(centralwidget);
m_centralLayout->setMargin(2);
m_rootSplitter = new QSplitter(centralwidget);
b_rootSplitterInitialized = false;
...
...
SCHNApps/src/view.cpp
View file @
6e1f65e5
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