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
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
80fef77f
Commit
80fef77f
authored
Mar 04, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add dll support to shader_radiance
parent
0390e0f1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
CGoGN/include/Utils/Shaders/shaderRadiancePerVertex.h
CGoGN/include/Utils/Shaders/shaderRadiancePerVertex.h
+4
-2
CGoGN/src/Utils/Shaders/shaderRadiancePerVertex.cpp
CGoGN/src/Utils/Shaders/shaderRadiancePerVertex.cpp
+2
-1
SCHNApps/Plugins/surface_radiance/src/surface_radiance.cpp
SCHNApps/Plugins/surface_radiance/src/surface_radiance.cpp
+1
-1
No files found.
CGoGN/include/Utils/Shaders/shaderRadiancePerVertex.h
View file @
80fef77f
...
...
@@ -30,13 +30,15 @@
#include "Utils/textures.h"
#include "Geometry/vector_gen.h"
#include "Utils/dll.h"
namespace
CGoGN
{
namespace
Utils
{
class
ShaderRadiancePerVertex
:
public
ClippingShader
class
CGoGN_UTILS_API
ShaderRadiancePerVertex
:
public
ClippingShader
{
protected:
// shader sources
...
...
@@ -74,7 +76,7 @@ public:
void
compile
();
void
setCamera
(
Geom
::
Vec3f
&
camera
);
void
setCamera
(
const
Geom
::
Vec3f
&
camera
);
void
setFragInterp
(
bool
fraginterp
);
bool
getFragInterp
()
{
return
m_fragInterp
;
}
...
...
CGoGN/src/Utils/Shaders/shaderRadiancePerVertex.cpp
View file @
80fef77f
...
...
@@ -21,6 +21,7 @@
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
#define CGoGN_UTILS_DLL_EXPORT 1
#include "Utils/Shaders/shaderRadiancePerVertex.h"
...
...
@@ -134,7 +135,7 @@ void ShaderRadiancePerVertex::compile()
unbind
();
}
void
ShaderRadiancePerVertex
::
setCamera
(
Geom
::
Vec3f
&
camera
)
void
ShaderRadiancePerVertex
::
setCamera
(
const
Geom
::
Vec3f
&
camera
)
{
m_camera
=
camera
;
bind
();
...
...
SCHNApps/Plugins/surface_radiance/src/surface_radiance.cpp
View file @
80fef77f
...
...
@@ -64,7 +64,7 @@ void Surface_Radiance_Plugin::drawMap(View* view, MapHandlerGen* map)
qglviewer
::
Vec
c
=
view
->
getCurrentCamera
()
->
position
();
PFP2
::
VEC3
camera
(
c
.
x
,
c
.
y
,
c
.
z
);
p
.
radiancePerVertexShader
->
setCamera
(
camera
);
p
.
radiancePerVertexShader
->
setCamera
(
Geom
::
Vec3f
(
camera
[
0
],
camera
[
1
],
camera
[
2
]));
// convert to Vec3f because PFP2 can hold Vec3d !
glPolygonMode
(
GL_FRONT_AND_BACK
,
GL_FILL
);
glEnable
(
GL_POLYGON_OFFSET_FILL
);
...
...
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