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
mirrage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
GameDevWeek
D
Dependencies
Cpp
mirrage
Commits
d997d0e2
Commit
d997d0e2
authored
Sep 21, 2019
by
Florian Oetke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
src/mirrage/renderer/include/mirrage/renderer/model_comp.hpp
src/mirrage/renderer/include/mirrage/renderer/model_comp.hpp
+6
-1
No files found.
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
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