Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hurstel
CGoGN
Commits
e1d0f43b
Commit
e1d0f43b
authored
Jul 01, 2014
by
Kenneth Vanhoey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor changes
parent
262c5ad4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
include/Utils/Shaders/shaderFlat.geom
include/Utils/Shaders/shaderFlat.geom
+5
-3
src/Utils/GLSLShader.cpp
src/Utils/GLSLShader.cpp
+1
-1
src/Utils/Qt/qtSimple.cpp
src/Utils/Qt/qtSimple.cpp
+1
-1
No files found.
include/Utils/Shaders/shaderFlat.geom
View file @
e1d0f43b
...
...
@@ -19,9 +19,11 @@ void main(void)
vec4
newPos
=
ModelViewMatrix
*
vec4
(
center
,
0
.
0
);
vec3
L
=
normalize
(
lightPosition
-
newPos
.
xyz
);
float
lambertTerm
=
dot
(
N
,
L
);
ColorFS
=
ambient
;
if
(
lambertTerm
>
0
.
0
)
ColorFS
+=
diffuse
*
lambertTerm
;
ColorFS
=
ambient
;
if
(
lambertTerm
>
0
.
0
)
ColorFS
+=
diffuse
*
lambertTerm
;
int
i
;
for
(
i
=
0
;
i
<
NBVERTS_IN
;
i
++
)
{
...
...
src/Utils/GLSLShader.cpp
View file @
e1d0f43b
...
...
@@ -1036,7 +1036,7 @@ void GLSLShader::setCurrentOGLVersion(unsigned int version)
*/
void
GLSLShader
::
updateMatrices
(
const
glm
::
mat4
&
projection
,
const
glm
::
mat4
&
modelview
)
{
this
->
bind
();
this
->
bind
();
if
(
*
m_uniMat_Proj
>=
0
)
glUniformMatrix4fv
(
*
m_uniMat_Proj
,
1
,
false
,
&
projection
[
0
][
0
]);
...
...
src/Utils/Qt/qtSimple.cpp
View file @
e1d0f43b
...
...
@@ -459,7 +459,7 @@ void SimpleQT::updateGL()
void
SimpleQT
::
updateGLMatrices
()
{
m_glWidget
->
modelModified
();
// m_glWidget->
updateGL();
updateGL
();
}
void
SimpleQT
::
transfoRotate
(
float
angle
,
float
x
,
float
y
,
float
z
)
...
...
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