Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GameDevWeek
Dependencies
Cpp
mirrage
Commits
d997d0e2
Commit
d997d0e2
authored
Sep 21, 2019
by
Florian Oetke
Browse files
added constructor parameter to renderer::Material_properties_comp
parent
97d1f27e
Pipeline
#3415
passed with stage
in 13 minutes and 33 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/mirrage/renderer/include/mirrage/renderer/model_comp.hpp
View file @
d997d0e2
...
...
@@ -17,7 +17,12 @@ namespace mirrage::renderer {
static
constexpr
const
char
*
name
()
{
return
"Material_property"
;
}
Material_property_comp
()
=
default
;
Material_property_comp
(
ecs
::
Entity_handle
owner
,
ecs
::
Entity_manager
&
em
)
:
Component
(
owner
,
em
)
{}
Material_property_comp
(
ecs
::
Entity_handle
owner
,
ecs
::
Entity_manager
&
em
,
glm
::
vec4
emissive_color
=
glm
::
vec4
(
1
,
1
,
1
,
1000.
f
))
:
Component
(
owner
,
em
),
emissive_color
(
emissive_color
)
{
}
glm
::
vec4
emissive_color
=
glm
::
vec4
(
1
,
1
,
1
,
1000.
f
);
};
...
...
Write
Preview
Supports
Markdown
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