Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Project_Phoenix
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LuFG VR VIS
VR-Group
Project_Phoenix
Commits
2d99fa59
Commit
2d99fa59
authored
7 years ago
by
demiralp
Browse files
Options
Downloads
Patches
Plain Diff
New display system complete.
parent
fccf6afd
No related branches found
No related tags found
1 merge request
!121
WIP: Feature/#388 reworked framegraph
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
library/phx/display_system.cpp
+11
-2
11 additions, 2 deletions
library/phx/display_system.cpp
library/phx/display_system.hpp
+6
-16
6 additions, 16 deletions
library/phx/display_system.hpp
with
17 additions
and
18 deletions
library/phx/display_system.cpp
+
11
−
2
View file @
2d99fa59
...
...
@@ -22,8 +22,17 @@
#include
"display_system.hpp"
#include
<vector>
namespace
phx
{
DisplaySystem
::
DisplaySystem
(
Engine
*
engine
)
:
System
(
engine
)
{}
DisplaySystem
::~
DisplaySystem
()
{}
void
DisplaySystem
::
Update
(
const
FrameTimer
::
TimeInfo
&
)
{
tick
();
}
std
::
vector
<
di
::
opengl_window
*>
DisplaySystem
::
OpenGLWindows
()
const
{
std
::
vector
<
di
::
opengl_window
*>
opengl_windows
;
for
(
auto
window
:
windows
())
{
auto
opengl_window
=
dynamic_cast
<
di
::
opengl_window
*>
(
window
);
if
(
opengl_window
)
opengl_windows
.
push_back
(
opengl_window
);
}
return
opengl_windows
;
}
}
// namespace phx
This diff is collapsed.
Click to expand it.
library/phx/display_system.hpp
+
6
−
16
View file @
2d99fa59
...
...
@@ -23,32 +23,22 @@
#ifndef LIBRARY_PHX_DISPLAY_SYSTEM_HPP_
#define LIBRARY_PHX_DISPLAY_SYSTEM_HPP_
#include
<memory>
#include
<di/systems/display/display_system.hpp>
#include
<di/systems/display/opengl_window.hpp>
#include
<vector>
#include
"phx/engine.hpp"
#include
"phx/export.hpp"
#include
"phx/render_target.hpp"
#include
"phx/system.hpp"
namespace
phx
{
class
PHOENIX_EXPORT
DisplaySystem
:
public
System
{
class
PHOENIX_EXPORT
DisplaySystem
:
public
System
,
public
di
::
display_system
{
public:
DisplaySystem
(
const
DisplaySystem
&
)
=
delete
;
DisplaySystem
(
DisplaySystem
&&
)
=
default
;
~
DisplaySystem
();
DisplaySystem
&
operator
=
(
const
DisplaySystem
&
)
=
delete
;
DisplaySystem
&
operator
=
(
DisplaySystem
&&
)
=
default
;
void
Update
(
const
FrameTimer
::
TimeInfo
&
)
override
;
void
Update
(
const
FrameTimer
::
TimeInfo
&
)
override
=
0
;
protected:
explicit
DisplaySystem
(
Engine
*
engine
);
friend
DisplaySystem
*
Engine
::
CreateSystem
<
DisplaySystem
>
();
std
::
vector
<
di
::
opengl_window
*>
OpenGLWindows
()
const
;
};
}
// namespace phx
#endif // LIBRARY_PHX_DISPLAY_SYSTEM_HPP_
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment