Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CGoGN
CGoGN
Commits
d9d335cb
Commit
d9d335cb
authored
Nov 25, 2015
by
Pierre Kraemer
Browse files
Merge branch 'develop' into 'master'
Develop See merge request
!84
parents
44801e31
1729eb93
Changes
4
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
d9d335cb
...
...
@@ -14,9 +14,9 @@ Linux
=====
Dependencies
------------
*
install for following package cmake cmake-curses-gui cmake-qt-gui libXi-dev libXmu-dev libglew-dev zlib1g-dev uuid-dev libgsl0-dev libsuitesparse-dev python2
7
*
install for following package cmake cmake-curses-gui cmake-qt-gui libXi-dev libXmu-dev libglew-dev zlib1g-dev uuid-dev libgsl0-dev libsuitesparse-dev python2
.7-dev
*
for Qt4: libqt4-dev qt4-dev-tools qtcreator
*
for Qt5: qt5-default qtbase5-dev-tools qtcreator
*
for Qt5: qt5-default qtbase5-dev-tools qtcreator
libqt5svg5-dev libqt5opengl5-dev
**Supported compilers: g++ 4.8 or greater**
...
...
SCHNApps/Plugins/surface_radiance/include/edgeSelectorRadiance.h
View file @
d9d335cb
...
...
@@ -66,7 +66,7 @@ private:
static
double
SHEvalCartesian_Error
(
double
x
,
double
y
,
double
z
,
void
*
u
)
{
SH
&
e
=
*
(
SH
*
)(
u
);
VEC3
c
=
e
.
evaluate_at
(
x
,
y
,
z
);
VEC3
c
=
e
.
evaluate_at
(
x
,
y
,
z
,
0
);
return
c
.
norm2
();
}
...
...
SCHNApps/Plugins/surface_radiance/include/halfEdgeSelectorRadiance.h
View file @
d9d335cb
...
...
@@ -66,7 +66,7 @@ private:
static
double
SHEvalCartesian_Error
(
double
x
,
double
y
,
double
z
,
void
*
u
)
{
SH
&
e
=
*
(
SH
*
)(
u
);
VEC3
c
=
e
.
evaluate_at
(
x
,
y
,
z
);
VEC3
c
=
e
.
evaluate_at
(
x
,
y
,
z
,
0
);
return
c
.
norm2
();
}
...
...
SCHNApps/Plugins/surface_radiance/include/surface_radiance.h
View file @
d9d335cb
...
...
@@ -173,7 +173,7 @@ protected:
static
double
SHEvalCartesian_Error
(
double
x
,
double
y
,
double
z
,
void
*
u
)
{
Utils
::
SphericalHarmonics
<
PFP2
::
REAL
,
PFP2
::
VEC3
>&
e
=
*
(
Utils
::
SphericalHarmonics
<
PFP2
::
REAL
,
PFP2
::
VEC3
>*
)(
u
);
PFP2
::
VEC3
c
=
e
.
evaluate_at
(
x
,
y
,
z
);
PFP2
::
VEC3
c
=
e
.
evaluate_at
(
x
,
y
,
z
,
0
);
return
c
.
norm2
();
}
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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