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
8ece0595
Commit
8ece0595
authored
6 years ago
by
demiralp
Browse files
Options
Downloads
Patches
Plain Diff
Corrected non-HMD setup.
parent
01c5b66f
Branches
Branches containing commit
No related tags found
1 merge request
!158
#473 resize companion window
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
library/phx/rendering/render_passes/blit_pass.hpp
+1
-1
1 addition, 1 deletion
library/phx/rendering/render_passes/blit_pass.hpp
library/phx/setup.cpp
+2
-1
2 additions, 1 deletion
library/phx/setup.cpp
with
3 additions
and
2 deletions
library/phx/rendering/render_passes/blit_pass.hpp
+
1
−
1
View file @
8ece0595
...
@@ -36,7 +36,7 @@ namespace phx {
...
@@ -36,7 +36,7 @@ namespace phx {
// A null target will blit onto the default framebuffer.
// A null target will blit onto the default framebuffer.
class
PHOENIX_EXPORT
BlitPass
:
public
RenderPass
{
class
PHOENIX_EXPORT
BlitPass
:
public
RenderPass
{
public:
public:
explicit
BlitPass
(
gl
::
framebuffer
*
source
,
gl
::
framebuffer
*
target
=
nullptr
);
explicit
BlitPass
(
gl
::
framebuffer
*
source
,
gl
::
framebuffer
*
target
);
explicit
BlitPass
(
gl
::
framebuffer
*
source
,
Window
*
target
);
explicit
BlitPass
(
gl
::
framebuffer
*
source
,
Window
*
target
);
BlitPass
(
const
BlitPass
&
)
=
default
;
BlitPass
(
const
BlitPass
&
)
=
default
;
BlitPass
(
BlitPass
&&
)
=
default
;
BlitPass
(
BlitPass
&&
)
=
default
;
...
...
This diff is collapsed.
Click to expand it.
library/phx/setup.cpp
+
2
−
1
View file @
8ece0595
...
@@ -129,7 +129,8 @@ void Setup::SetupDefaultFrameGraphWindow(RenderingSystem* rendering_system,
...
@@ -129,7 +129,8 @@ void Setup::SetupDefaultFrameGraphWindow(RenderingSystem* rendering_system,
frame_graph
->
AddRenderPass
(
std
::
make_unique
<
ClearPass
>
(
render_target
));
frame_graph
->
AddRenderPass
(
std
::
make_unique
<
ClearPass
>
(
render_target
));
frame_graph
->
AddRenderPass
(
std
::
make_unique
<
SkyboxPass
>
(
render_target
));
frame_graph
->
AddRenderPass
(
std
::
make_unique
<
SkyboxPass
>
(
render_target
));
frame_graph
->
AddRenderPass
(
std
::
make_unique
<
GeometryPass
>
(
render_target
));
frame_graph
->
AddRenderPass
(
std
::
make_unique
<
GeometryPass
>
(
render_target
));
frame_graph
->
AddRenderPass
(
std
::
make_unique
<
BlitPass
>
(
render_target
));
frame_graph
->
AddRenderPass
(
std
::
make_unique
<
BlitPass
>
(
render_target
,
engine
->
GetSystem
<
DisplaySystemWindow
>
()
->
GetWindow
()));
frame_graph
->
Initialize
();
frame_graph
->
Initialize
();
...
...
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