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
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
d9d335cb
Commit
d9d335cb
authored
Nov 25, 2015
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into 'master'
Develop See merge request !84
parents
44801e31
1729eb93
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
README.md
README.md
+2
-2
SCHNApps/Plugins/surface_radiance/include/edgeSelectorRadiance.h
...s/Plugins/surface_radiance/include/edgeSelectorRadiance.h
+1
-1
SCHNApps/Plugins/surface_radiance/include/halfEdgeSelectorRadiance.h
...ugins/surface_radiance/include/halfEdgeSelectorRadiance.h
+1
-1
SCHNApps/Plugins/surface_radiance/include/surface_radiance.h
SCHNApps/Plugins/surface_radiance/include/surface_radiance.h
+1
-1
No files found.
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
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