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
O
OpenFlipper
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
f064e3bd
Commit
f064e3bd
authored
Dec 08, 2017
by
Weizhen Huang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into featurephysicallyBasedMaterial
parents
16698e30
7c10bc7d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
15 deletions
+15
-15
libs_required/ACG/GL/DrawMesh.hh
libs_required/ACG/GL/DrawMesh.hh
+1
-1
libs_required/ACG/GL/GLState.cc
libs_required/ACG/GL/GLState.cc
+2
-2
libs_required/ACG/Scenegraph/MaterialNode.cc
libs_required/ACG/Scenegraph/MaterialNode.cc
+1
-1
libs_required/ACG/Scenegraph/MaterialNode.hh
libs_required/ACG/Scenegraph/MaterialNode.hh
+11
-11
No files found.
libs_required/ACG/GL/DrawMesh.hh
View file @
f064e3bd
...
...
@@ -65,7 +65,7 @@
#include <vector>
#include <list>
#include <OpenMesh/Core/Utils/Property.hh>
#include <OpenMesh/Core/
IO/MeshIO
.hh>
#include <OpenMesh/Core/
Utils/color_cast
.hh>
#include <ACG/GL/globjects.hh>
#include <ACG/GL/GLState.hh>
...
...
libs_required/ACG/GL/GLState.cc
View file @
f064e3bd
libs_required/ACG/Scenegraph/MaterialNode.cc
View file @
f064e3bd
...
...
@@ -554,7 +554,7 @@ MaterialNode::read(std::istream& _is)
material_
.
setRefractive
(
b
);
}
}
//
OverlayColor
//
Refraction Index
else
if
(
specifier
==
"indexOfRefraction"
)
{
buffer
>>
x
;
...
...
libs_required/ACG/Scenegraph/MaterialNode.hh
View file @
f064e3bd
...
...
@@ -167,15 +167,15 @@ public:
1.0
));
}
/// set the base color
/// set the base color
(Sets the baseColor which is the same as the emission(const Vec4f& _c) )
void
baseColor
(
const
Vec4f
&
_c
)
{
baseColor_
=
_c
;}
/// get the base color
/// get the base color
( Same as emission() )
const
Vec4f
&
baseColor
()
const
{
return
baseColor_
;
}
/// set emission
void
emission
(
const
Vec4f
&
_c
)
{
baseColor_
=
_c
;}
/// get emission
const
Vec4f
&
emission
()
const
{
return
baseColor_
;
}
/// set emission
( Same as baseColor( const Vec4f& _c )) )
void
emission
Color
(
const
Vec4f
&
_c
)
{
baseColor_
=
_c
;}
/// get emission
( Same as baseColor() )
const
Vec4f
&
emission
Color
()
const
{
return
baseColor_
;
}
/// set the ambient color.
void
ambientColor
(
const
Vec4f
&
_a
)
{
ambientColor_
=
_a
;
}
...
...
@@ -222,7 +222,7 @@ public:
double
indexOfRefraction
()
const
{
return
indexOfRefraction_
;
}
/// set refractive flag
void
set
_r
efractive
(
bool
_r
)
{
isRefractive_
=
_r
;
}
void
set
R
efractive
(
bool
_r
)
{
isRefractive_
=
_r
;
}
/// get refractive flag
bool
isRefractive
()
const
{
return
isRefractive_
;}
...
...
@@ -423,14 +423,14 @@ public:
material_
.
generateRandomColor
();
}
/// set the base color
/// set the base color
( Same as set_emission(const Vec4f& _c) )
void
set_base_color
(
const
Vec4f
&
_c
)
{
material_
.
baseColor
(
_c
);
}
/// get the base color
/// get the base color
( same as emission() )
const
Vec4f
&
base_color
()
const
{
return
material_
.
baseColor
();
}
/// set emission
/// set emission
( same as set_base_color(const Vec4f& _c) )
void
set_emission
(
const
Vec4f
&
_c
)
{
material_
.
baseColor
(
_c
);
}
/// get emission
/// get emission
( same as base_color() )
const
Vec4f
&
emission
()
const
{
return
material_
.
baseColor
();
}
/// set the ambient color.
...
...
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