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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
KennethVanhoey
CGoGN
Commits
0fe57133
Commit
0fe57133
authored
Oct 08, 2012
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compilation bugs
parent
25620752
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
11 deletions
+9
-11
include/Utils/pointSprite.h
include/Utils/pointSprite.h
+1
-3
include/Utils/text3d.h
include/Utils/text3d.h
+1
-1
src/Utils/Shaders/shaderPhong.cpp
src/Utils/Shaders/shaderPhong.cpp
+2
-2
src/Utils/pointSprite.cpp
src/Utils/pointSprite.cpp
+1
-1
src/Utils/text3d.cpp
src/Utils/text3d.cpp
+4
-4
No files found.
include/Utils/pointSprite.h
View file @
0fe57133
...
...
@@ -62,8 +62,6 @@ protected:
CGoGNGLuint
m_uniform_texture
;
CGoGNGLuint
m_uniform_texture
;
CGoGNGLuint
m_uniform_planeX
;
CGoGNGLuint
m_uniform_planeY
;
...
...
@@ -107,7 +105,7 @@ public:
/**
* set the plane of rendering for VR rendering
*/
void
setPlane
(
const
Geom
::
Vec3f
&
ox
,
const
Geom
::
Vec3f
&
o
x
);
void
setPlane
(
const
Geom
::
Vec3f
&
ox
,
const
Geom
::
Vec3f
&
o
y
);
/**
...
...
include/Utils/text3d.h
View file @
0fe57133
...
...
@@ -148,7 +148,7 @@ public:
/**
* set the plane of rendering for VR rendering
*/
void
setPlane
(
const
Geom
::
Vec3f
&
ox
,
const
Geom
::
Vec3f
&
o
x
);
void
setPlane
(
const
Geom
::
Vec3f
&
ox
,
const
Geom
::
Vec3f
&
o
y
);
void
toSVG
(
Utils
::
SVG
::
SVGOut
&
svg
);
...
...
src/Utils/Shaders/shaderPhong.cpp
View file @
0fe57133
...
...
@@ -44,7 +44,7 @@ ShaderPhong::ShaderPhong(bool doubleSided, bool withEyePosition):
m_lightPos
(
Geom
::
Vec3f
(
10.0
f
,
10.0
f
,
1000.0
f
)),
m_vboPos
(
NULL
),
m_vboNormal
(
NULL
),
m_vboColor
(
NULL
)
,
m_vboColor
(
NULL
)
{
m_nameVS
=
"ShaderPhong_vs"
;
...
...
@@ -133,7 +133,7 @@ void ShaderPhong::setEyePosition( Geom::Vec3f eyePos)
if
(
m_with_eyepos
)
{
this
->
bind
();
glUniform3fv
(
*
m_unif_eye
t
Pos
,
1
,
eyePos
.
data
());
glUniform3fv
(
*
m_unif_eyePos
,
1
,
eyePos
.
data
());
m_eyePos
=
eyePos
;
}
}
...
...
src/Utils/pointSprite.cpp
View file @
0fe57133
...
...
@@ -41,7 +41,7 @@ PointSprite* PointSprite::m_instance0 = NULL;
PointSprite
::
PointSprite
(
bool
withColorPervertex
,
float
radius
)
PointSprite
::
PointSprite
(
bool
withColorPervertex
,
float
radius
,
bool
with_plane
)
{
std
::
string
defineColor
(
"#define WITH_COLOR_PER_VERTEX 1
\n
"
);
...
...
src/Utils/text3d.cpp
View file @
0fe57133
...
...
@@ -68,7 +68,7 @@ Strings3D::Strings3D(bool withBackground, const Geom::Vec3f& bgc, bool with_plan
std
::
string
glxvert
(
*
GLSLShader
::
DEFINES_GL
);
if
(
with_plane
)
glxvert
e
.
append
(
"#define WITH_PLANE 1"
)
glxvert
.
append
(
"#define WITH_PLANE 1"
);
glxvert
.
append
(
vertexShaderText
);
std
::
string
glxfrag
(
*
GLSLShader
::
DEFINES_GL
);
...
...
@@ -116,11 +116,11 @@ void Strings3D::setScale(float scale)
unbind
();
}
void
Strings3D
::
setPlane
(
const
Geom
::
Vec3f
&
ox
,
const
Geom
::
Vec3f
&
o
x
)
void
Strings3D
::
setPlane
(
const
Geom
::
Vec3f
&
ox
,
const
Geom
::
Vec3f
&
o
y
)
{
bind
();
glUniform3f
(
*
m_uniform_planeX
,
ox
);
glUniform3f
(
*
m_uniform_planeY
,
oy
);
glUniform3f
v
(
*
m_uniform_planeX
,
1
,
ox
.
data
()
);
glUniform3f
v
(
*
m_uniform_planeY
,
1
,
oy
.
data
()
);
unbind
();
}
...
...
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