Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
VkCV Demos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Vulkan2021
VkCV Demos
Commits
d4183b16
Verified
Commit
d4183b16
authored
2 years ago
by
Tobias Frisch
Browse files
Options
Downloads
Patches
Plain Diff
Correct texture format and update framework
Signed-off-by:
Tobias Frisch
<
tfrisch@uni-koblenz.de
>
parent
c15bd821
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
demos/CubeMapping/src/main.cpp
+1
-1
1 addition, 1 deletion
demos/CubeMapping/src/main.cpp
demos/NormalMapping/src/main.cpp
+2
-2
2 additions, 2 deletions
demos/NormalMapping/src/main.cpp
framework
+1
-1
1 addition, 1 deletion
framework
with
4 additions
and
4 deletions
demos/CubeMapping/src/main.cpp
+
1
−
1
View file @
d4183b16
...
@@ -208,7 +208,7 @@ int main(int argc, const char** argv) {
...
@@ -208,7 +208,7 @@ int main(int argc, const char** argv) {
vkcv
::
ImageConfig
cubemapConfig
(
negx
.
w
,
negx
.
h
);
vkcv
::
ImageConfig
cubemapConfig
(
negx
.
w
,
negx
.
h
);
cubemapConfig
.
setCubeMapImage
(
true
);
cubemapConfig
.
setCubeMapImage
(
true
);
vkcv
::
Image
cubemapImage
=
vkcv
::
image
(
core
,
vk
::
Format
::
eR8G8B8A8
Srgb
,
cubemapConfig
);
vkcv
::
Image
cubemapImage
=
vkcv
::
image
(
core
,
vk
::
Format
::
eR8G8B8A8
Unorm
,
cubemapConfig
);
cubemapImage
.
fillLayer
(
0
,
posx
.
data
.
data
());
cubemapImage
.
fillLayer
(
0
,
posx
.
data
.
data
());
cubemapImage
.
fillLayer
(
1
,
negx
.
data
.
data
());
cubemapImage
.
fillLayer
(
1
,
negx
.
data
.
data
());
cubemapImage
.
fillLayer
(
2
,
posy
.
data
.
data
());
cubemapImage
.
fillLayer
(
2
,
posy
.
data
.
data
());
...
...
This diff is collapsed.
Click to expand it.
demos/NormalMapping/src/main.cpp
+
2
−
2
View file @
d4183b16
...
@@ -203,10 +203,10 @@ int main(int argc, const char** argv) {
...
@@ -203,10 +203,10 @@ int main(int argc, const char** argv) {
vkcv
::
asset
::
Texture
diffusemap
=
vkcv
::
asset
::
loadTexture
(
"../../resources/normalmapping/diffusemap.png"
);
vkcv
::
asset
::
Texture
diffusemap
=
vkcv
::
asset
::
loadTexture
(
"../../resources/normalmapping/diffusemap.png"
);
vkcv
::
asset
::
Texture
normalmap
=
vkcv
::
asset
::
loadTexture
(
"../../resources/normalmapping/normalmap.png"
);
vkcv
::
asset
::
Texture
normalmap
=
vkcv
::
asset
::
loadTexture
(
"../../resources/normalmapping/normalmap.png"
);
vkcv
::
Image
diffusemapImage
=
vkcv
::
image
(
core
,
vk
::
Format
::
eR8G8B8A8
Srgb
,
diffusemap
.
w
,
diffusemap
.
h
);
vkcv
::
Image
diffusemapImage
=
vkcv
::
image
(
core
,
vk
::
Format
::
eR8G8B8A8
Unorm
,
diffusemap
.
w
,
diffusemap
.
h
);
diffusemapImage
.
fill
(
diffusemap
.
data
.
data
());
diffusemapImage
.
fill
(
diffusemap
.
data
.
data
());
vkcv
::
Image
normalmapImage
=
vkcv
::
image
(
core
,
vk
::
Format
::
eR8G8B8A8
Srgb
,
normalmap
.
w
,
normalmap
.
h
);
vkcv
::
Image
normalmapImage
=
vkcv
::
image
(
core
,
vk
::
Format
::
eR8G8B8A8
Unorm
,
normalmap
.
w
,
normalmap
.
h
);
normalmapImage
.
fill
(
normalmap
.
data
.
data
());
normalmapImage
.
fill
(
normalmap
.
data
.
data
());
vkcv
::
SamplerHandle
sampler
=
vkcv
::
samplerLinear
(
core
);
vkcv
::
SamplerHandle
sampler
=
vkcv
::
samplerLinear
(
core
);
...
...
This diff is collapsed.
Click to expand it.
framework
@
393809b4
Compare
68955e55
...
393809b4
Subproject commit
68955e55e1406d28006fa5696f11d10c987b8530
Subproject commit
393809b4e6e8c0e5fa79e8501ceb3cc31462c9fd
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