Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
VkCV Framework
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 Framework
Commits
b3ec2867
Commit
b3ec2867
authored
3 years ago
by
Lars Hoerttrich
Browse files
Options
Downloads
Patches
Plain Diff
[
#79
] went through TODOs as group and eliminated some that are already done
parent
f88c6c0c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!69
Resolve "Rework Asset Loader API"
Pipeline
#26242
passed
3 years ago
Stage: build
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/asset_loader/src/vkcv/asset/asset_loader.cpp
+2
-35
2 additions, 35 deletions
modules/asset_loader/src/vkcv/asset/asset_loader.cpp
with
2 additions
and
35 deletions
modules/asset_loader/src/vkcv/asset/asset_loader.cpp
+
2
−
35
View file @
b3ec2867
...
@@ -97,11 +97,6 @@ int createTextures(const std::vector<fx::gltf::Texture>& tex_src,
...
@@ -97,11 +97,6 @@ int createTextures(const std::vector<fx::gltf::Texture>& tex_src,
{
{
dst
.
clear
();
dst
.
clear
();
dst
.
reserve
(
tex_src
.
size
());
dst
.
reserve
(
tex_src
.
size
());
// TODO Image objects in glTF can have
// 1) a URI
// 2) a bufferView and a mimeType
// to describe where/how to load the data.
// currently does not support mimeType
for
(
int
i
=
0
;
i
<
tex_src
.
size
();
i
++
)
{
for
(
int
i
=
0
;
i
<
tex_src
.
size
();
i
++
)
{
std
::
string
uri
=
dir
+
"/"
+
img_src
[
tex_src
[
i
].
source
].
uri
;
std
::
string
uri
=
dir
+
"/"
+
img_src
[
tex_src
[
i
].
source
].
uri
;
int
w
,
h
,
c
;
int
w
,
h
,
c
;
...
@@ -115,6 +110,7 @@ int createTextures(const std::vector<fx::gltf::Texture>& tex_src,
...
@@ -115,6 +110,7 @@ int createTextures(const std::vector<fx::gltf::Texture>& tex_src,
}
}
}
}
else
{
else
{
//TODO this is untested. Find gltf file without uri to test it!
const
fx
::
gltf
::
BufferView
bufferView
=
bV_src
[
img_src
[
tex_src
[
i
].
source
].
bufferView
];
const
fx
::
gltf
::
BufferView
bufferView
=
bV_src
[
img_src
[
tex_src
[
i
].
source
].
bufferView
];
data
=
stbi_load_from_memory
(
&
buf_src
[
bufferView
.
buffer
].
data
[
bufferView
.
byteOffset
],
bufferView
.
byteLength
,
&
w
,
&
h
,
&
c
,
4
);
data
=
stbi_load_from_memory
(
&
buf_src
[
bufferView
.
buffer
].
data
[
bufferView
.
byteOffset
],
bufferView
.
byteLength
,
&
w
,
&
h
,
&
c
,
4
);
if
(
!
data
)
{
if
(
!
data
)
{
...
@@ -433,7 +429,7 @@ int createVertexGroups(fx::gltf::Mesh const& objectMesh,
...
@@ -433,7 +429,7 @@ int createVertexGroups(fx::gltf::Mesh const& objectMesh,
for
(
const
auto
&
attribute
:
vertexAttributes
)
{
for
(
const
auto
&
attribute
:
vertexAttributes
)
{
relevantBufferOffset
=
std
::
min
(
attribute
.
offset
,
relevantBufferOffset
);
relevantBufferOffset
=
std
::
min
(
attribute
.
offset
,
relevantBufferOffset
);
const
uint32_t
attributeEnd
=
attribute
.
offset
+
attribute
.
length
;
const
uint32_t
attributeEnd
=
attribute
.
offset
+
attribute
.
length
;
relevantBufferEnd
=
std
::
max
(
relevantBufferEnd
,
attributeEnd
);
// TODO: need to incorporate stride?
relevantBufferEnd
=
std
::
max
(
relevantBufferEnd
,
attributeEnd
);
}
}
const
uint32_t
relevantBufferSize
=
relevantBufferEnd
-
relevantBufferOffset
;
const
uint32_t
relevantBufferSize
=
relevantBufferEnd
-
relevantBufferOffset
;
...
@@ -502,15 +498,6 @@ int createMaterial(fx::gltf::Document &sceneObjects, std::vector<Material> &mate
...
@@ -502,15 +498,6 @@ int createMaterial(fx::gltf::Document &sceneObjects, std::vector<Material> &mate
fx
::
gltf
::
Material
material
=
sceneObjects
.
materials
[
l
];
fx
::
gltf
::
Material
material
=
sceneObjects
.
materials
[
l
];
uint16_t
textureMask
=
0
;
uint16_t
textureMask
=
0
;
generateTextureMask
(
material
,
textureMask
);
generateTextureMask
(
material
,
textureMask
);
// TODO When constructing the the vkcv::asset::Material we need to
// test what kind of texture targets it has and then define the
// textureMask for it.
// Also, what does the fx::gltf::Material do with indices of
// texture targets that don't exist? Maybe we shouldn't set the
// index for eb. the normalTexture if there is no normal texture...
// It may be a good idea to create an extra function for creating a
// material and adding it to the materials array instead of trying
// to fit it all into one push_back({...}) call.
materials
.
push_back
({
materials
.
push_back
({
textureMask
,
textureMask
,
material
.
pbrMetallicRoughness
.
baseColorTexture
.
index
,
material
.
pbrMetallicRoughness
.
baseColorTexture
.
index
,
...
@@ -544,20 +531,6 @@ int createMaterial(fx::gltf::Document &sceneObjects, std::vector<Material> &mate
...
@@ -544,20 +531,6 @@ int createMaterial(fx::gltf::Document &sceneObjects, std::vector<Material> &mate
int
loadScene
(
const
std
::
filesystem
::
path
&
path
,
Scene
&
scene
){
int
loadScene
(
const
std
::
filesystem
::
path
&
path
,
Scene
&
scene
){
fx
::
gltf
::
Document
sceneObjects
;
fx
::
gltf
::
Document
sceneObjects
;
/*
try {
if (path.rfind(".glb", (path.length()-4)) != std::string::npos) {
sceneObjects = fx::gltf::LoadFromBinary(path);
} else {
sceneObjects = fx::gltf::LoadFromText(path);
}
} catch (const std::system_error &err) {
recurseExceptionPrint(err, path);
return ASSET_ERROR;
} catch (const std::exception &e) {
recurseExceptionPrint(e, path);
return ASSET_ERROR;
}*/
try
{
try
{
if
(
path
.
extension
()
==
".glb"
)
{
if
(
path
.
extension
()
==
".glb"
)
{
...
@@ -575,12 +548,6 @@ int loadScene(const std::filesystem::path &path, Scene &scene){
...
@@ -575,12 +548,6 @@ int loadScene(const std::filesystem::path &path, Scene &scene){
recurseExceptionPrint
(
e
,
path
.
string
());
recurseExceptionPrint
(
e
,
path
.
string
());
return
ASSET_ERROR
;
return
ASSET_ERROR
;
}
}
// TODO use std::filesystem::path instead of std::string for path/uri.
// Using simple strings and assuming the path separator symbol to be "/" is
// not safe across different operating systems. --erledigt
//size_t pos = path.find_last_of("/");
//auto dir = path.substr(0, pos);
auto
dir
=
path
.
parent_path
().
string
();
auto
dir
=
path
.
parent_path
().
string
();
// file has to contain at least one mesh
// file has to contain at least one mesh
...
...
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