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
KennethVanhoey
CGoGN
Commits
5bcd6811
Commit
5bcd6811
authored
Feb 24, 2012
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of cgogn:~thery/CGoGN
parents
412ca15a
51a9d2d8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
4 deletions
+2
-4
include/Algo/Render/GL2/topo3Render.hpp
include/Algo/Render/GL2/topo3Render.hpp
+0
-2
include/Utils/Shaders/shaderExplodeVolumes.geom
include/Utils/Shaders/shaderExplodeVolumes.geom
+1
-1
src/Utils/frameManipulator.cpp
src/Utils/frameManipulator.cpp
+1
-1
No files found.
include/Algo/Render/GL2/topo3Render.hpp
View file @
5bcd6811
...
...
@@ -33,8 +33,6 @@
#include "Topology/generic/traversorCell.h"
#include "Algo/Geometry/centroid.h"
#include <sys/time.h>
namespace
CGoGN
{
...
...
include/Utils/Shaders/shaderExplodeVolumes.geom
View file @
5bcd6811
...
...
@@ -10,7 +10,7 @@ uniform vec4 ambient;
uniform
vec4
backColor
;
uniform
vec4
plane
;
VARYING_IN
vec3
colorVertex
[];
VARYING_IN
vec3
colorVertex
[
3
];
VARYING_OUT
vec4
ColorFS
;
...
...
src/Utils/frameManipulator.cpp
View file @
5bcd6811
...
...
@@ -865,7 +865,7 @@ float FrameManipulator::distanceFromMouse(int dx, int dy)
float
FrameManipulator
::
scaleFromMouse
(
int
dx
,
int
dy
)
{
if
(
f
abs
(
dx
)
>
f
abs
(
dy
))
if
(
abs
(
dx
)
>
abs
(
dy
))
{
if
(
dx
>
0
)
return
1.01
;
...
...
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