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
c253b671
Commit
c253b671
authored
7 years ago
by
Sebastian Pape
Browse files
Options
Downloads
Patches
Plain Diff
Fixed issues with that occurred from merge
parent
0d4b2846
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
demos/optical_bench/src/controller_overlay.cpp
+1
-0
1 addition, 0 deletions
demos/optical_bench/src/controller_overlay.cpp
demos/optical_bench/src/ray_pass.cpp
+1
-0
1 addition, 0 deletions
demos/optical_bench/src/ray_pass.cpp
with
2 additions
and
0 deletions
demos/optical_bench/src/controller_overlay.cpp
+
1
−
0
View file @
c253b671
...
@@ -173,5 +173,6 @@ void phx::ControllerOverlay::setEntityImage(
...
@@ -173,5 +173,6 @@ void phx::ControllerOverlay::setEntityImage(
phx
::
Entity
*
e
,
phx
::
ResourcePointer
<
phx
::
Image
>
i
)
{
phx
::
Entity
*
e
,
phx
::
ResourcePointer
<
phx
::
Image
>
i
)
{
e
->
GetFirstComponent
<
phx
::
MaterialHandle
>
()
->
GetMaterial
()
->
SetAmbientImage
(
e
->
GetFirstComponent
<
phx
::
MaterialHandle
>
()
->
GetMaterial
()
->
SetAmbientImage
(
i
);
i
);
e
->
GetFirstComponent
<
phx
::
MaterialHandle
>
()
->
GetMaterial
()
->
UploadTextures
();
}
}
}
// namespace phx
}
// namespace phx
This diff is collapsed.
Click to expand it.
demos/optical_bench/src/ray_pass.cpp
+
1
−
0
View file @
c253b671
...
@@ -279,6 +279,7 @@ void RayPass::createTarget() {
...
@@ -279,6 +279,7 @@ void RayPass::createTarget() {
target_screen_
=
handle
;
target_screen_
=
handle
;
}
}
}
}
target_screen_
->
GetMaterial
()
->
UploadTextures
();
target_texture
=
target_screen_
->
GetMaterial
()
->
GetAmbientTexture
();
target_texture
=
target_screen_
->
GetMaterial
()
->
GetAmbientTexture
();
// used to expand the data in RAM and map back to GPU
// used to expand the data in RAM and map back to GPU
...
...
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