Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merged vsgXchange master into 1.0 branch #154

Merged
merged 11 commits into from
Jul 20, 2023
Merged

Merged vsgXchange master into 1.0 branch #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
063f79a
Update to handle change to FBX embedded image storage
drywolf Jul 5, 2023
98839d9
Added handling of texture->mHeight != 0 case.
robertosfield Jul 5, 2023
246b746
Fixed mapping of Assimp colour to VSG colour.
robertosfield Jul 5, 2023
c61494a
Merge pull request #152 from vsg-dev/AssimpEmbeddedTextures
robertosfield Jul 5, 2023
cc1e95c
Bumped version number in prep for the next vsgXchange release
robertosfield Jul 5, 2023
5c93a8a
Updated to use the new API in DescriptorConfiguratrion.
robertosfield Jul 11, 2023
266e9f9
Added sharing of descriptors
robertosfield Jul 11, 2023
41e6cfa
Updates to work with changes to vsg::GraphcisPipelineConfigurator
robertosfield Jul 14, 2023
285b0ef
Merge branch 'master' into MultiDescriptorSetConfiguration
robertosfield Jul 19, 2023
9a0e991
Bumped required VSG version to 1.0.8
robertosfield Jul 20, 2023
bf17a9f
Merge pull request #153 from vsg-dev/MultiDescriptorSetConfiguration
robertosfield Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.7)

project(vsgXchange
VERSION 1.0.3
VERSION 1.0.4
DESCRIPTION "VulkanSceneGraph 3rd party data integration library"
LANGUAGES CXX C
)
set(VSGXCHANGE_SOVERSION 1)
SET(VSGXCHANGE_RELEASE_CANDIDATE 0)
SET(VSGXCHANGE_RELEASE_CANDIDATE 1)

set(VSGXCHANGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "Root source directory of vsgXchange.")
set(VSGXCHANGE_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE INTERNAL "Root binary directory of vsgXchange.")
Expand All @@ -20,7 +20,7 @@ if (VULKAN_SDK)
set(ENV{VULKAN_SDK} ${VULKAN_SDK})
endif()

set(VSG_MIN_VERSION 1.0.3)
set(VSG_MIN_VERSION 1.0.8)
find_package(vsg ${VSG_MIN_VERSION})

vsg_setup_dir_vars()
Expand Down
112 changes: 50 additions & 62 deletions src/assimp/assimp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ struct SceneConverter
using CameraMap = std::map<std::string, vsg::ref_ptr<vsg::Camera>>;
using LightMap = std::map<std::string, vsg::ref_ptr<vsg::Light>>;

vsg::Path filename;

vsg::ref_ptr<const vsg::Options> options;
const aiScene* scene = nullptr;
CameraMap cameraMap;
Expand Down Expand Up @@ -249,25 +251,47 @@ SamplerData SceneConverter::convertTexture(const aiMaterial& material, aiTexture
{
SamplerData samplerImage;

if (texPath.data[0] == '*')
if (auto texture = scene->GetEmbeddedTexture(texPath.C_Str()))
{
const auto texIndex = std::atoi(texPath.C_Str() + 1);
const auto texture = scene->mTextures[texIndex];
if (texture->mWidth > 0 && texture->mHeight == 0)
// check embedded texture has no width so must be invalid
if (texture->mWidth == 0) return {};

if (texture->mHeight == 0)
{
vsg::debug("filename = ", filename, " : Embedded compressed format texture->achFormatHint = ", texture->achFormatHint);

// texture is a compressed format, defer to the VSG's vsg::read() to convert the block of data to vsg::Data image.
auto imageOptions = vsg::Options::create(*options);
imageOptions->extensionHint = vsg::Path(".") + texture->achFormatHint;
if (samplerImage.data = vsg::read_cast<vsg::Data>(reinterpret_cast<const uint8_t*>(texture->pcData), texture->mWidth, imageOptions); !samplerImage.data.valid())
return {};
samplerImage.data = vsg::read_cast<vsg::Data>(reinterpret_cast<const uint8_t*>(texture->pcData), texture->mWidth, imageOptions);

// if no data assigned return null
if (!samplerImage.data) return {};
}
else
{
vsg::debug("filename = ", filename, " : Embedded raw format texture->achFormatHint = ", texture->achFormatHint);

// Vulkan doesn't support this format we have to reorder it to RGBA
auto image = vsg::ubvec4Array2D::create(texture->mWidth, texture->mHeight, vsg::Data::Properties{VK_FORMAT_R8G8B8A8_UNORM});
auto src = texture->pcData;
for(auto& dest_c : *image)
{
auto& src_c = *(src++);
dest_c.r = src_c.r;
dest_c.g = src_c.g;
dest_c.b = src_c.b;
dest_c.a = src_c.a;
}
samplerImage.data = image;
}
}
else
{
auto filename = vsg::findFile(texPath.C_Str(), options);

if (samplerImage.data = vsg::read_cast<vsg::Data>(filename, options); !samplerImage.data.valid())
auto textureFilename = vsg::findFile(texPath.C_Str(), options);
if (samplerImage.data = vsg::read_cast<vsg::Data>(textureFilename, options); !samplerImage.data.valid())
{
vsg::warn("Failed to load texture: ", filename, " texPath = ", texPath.C_Str());
vsg::warn("Failed to load texture: ", textureFilename, " texPath = ", texPath.C_Str());
return {};
}
}
Expand Down Expand Up @@ -460,14 +484,14 @@ void SceneConverter::convert(const aiMaterial* material, vsg::DescriptorConfigur

if (sharedObjects)
{
sharedObjects->share(convertedMaterial.descriptors);
}

auto descriptorSetLayout = vsg::DescriptorSetLayout::create(convertedMaterial.descriptorBindings);
convertedMaterial.descriptorSet = vsg::DescriptorSet::create(descriptorSetLayout, convertedMaterial.descriptors);
if (sharedObjects)
{
sharedObjects->share(convertedMaterial.descriptorSet);
for(auto& ds : convertedMaterial.descriptorSets)
{
if (ds)
{
sharedObjects->share(ds->descriptors);
sharedObjects->share(ds);
}
}
}
}

Expand Down Expand Up @@ -524,7 +548,7 @@ void SceneConverter::convert(const aiMesh* mesh, vsg::ref_ptr<vsg::Node>& node)
}

std::string name = mesh->mName.C_Str();
auto& material = *convertedMaterials[mesh->mMaterialIndex];
auto material = convertedMaterials[mesh->mMaterialIndex];

// count the number of indices of each type
uint32_t numTriangleIndices = 0;
Expand Down Expand Up @@ -582,8 +606,8 @@ void SceneConverter::convert(const aiMesh* mesh, vsg::ref_ptr<vsg::Node>& node)
return;
}

auto config = vsg::GraphicsPipelineConfigurator::create(material.shaderSet);
config->shaderHints->defines = material.defines;
auto config = vsg::GraphicsPipelineConfigurator::create(material->shaderSet);
config->descriptorConfigurator = material;

config->inputAssemblyState->topology = topology;
auto indices = createIndices(mesh, numIndicesPerFace, numIndices);
Expand Down Expand Up @@ -641,69 +665,32 @@ void SceneConverter::convert(const aiMesh* mesh, vsg::ref_ptr<vsg::Node>& node)
vid->instanceCount = 1;
if (!name.empty()) vid->setValue("name", name);

if (material.blending)
if (material->blending)
{
config->colorBlendState->attachments = vsg::ColorBlendState::ColorBlendAttachments{
{true, VK_BLEND_FACTOR_SRC_ALPHA, VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA, VK_BLEND_OP_ADD, VK_BLEND_FACTOR_SRC_ALPHA, VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA, VK_BLEND_OP_SUBTRACT, VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT}};

if (sharedObjects) sharedObjects->share(config->colorBlendState);
}

if (material.two_sided)
if (material->two_sided)
{
config->rasterizationState->cullMode = VK_CULL_MODE_NONE;
}

// pass DescriptorSetLaout to config
if (material.descriptorSet)
{
config->descriptorSetLayout = material.descriptorSet->setLayout;
config->descriptorBindings = material.descriptorBindings;
}

// set up ViewDependentState
if (useViewDependentState)
{
vsg::ref_ptr<vsg::ViewDescriptorSetLayout> vdsl;
if (sharedObjects)
vdsl = sharedObjects->shared_default<vsg::ViewDescriptorSetLayout>();
else
vdsl = vsg::ViewDescriptorSetLayout::create();
config->additionalDescriptorSetLayout = vdsl;
}

if (sharedObjects)
sharedObjects->share(config, [](auto gpc) { gpc->init(); });
else
config->init();

if (sharedObjects) sharedObjects->share(config->bindGraphicsPipeline);

// create StateGroup as the root of the scene/command graph to hold the GraphicsProgram, and binding of Descriptors to decorate the whole graph
auto stateGroup = vsg::StateGroup::create();
stateGroup->add(config->bindGraphicsPipeline);

if (material.descriptorSet)
{
auto bindDescriptorSet = vsg::BindDescriptorSet::create(VK_PIPELINE_BIND_POINT_GRAPHICS, config->layout, 0, material.descriptorSet);
if (sharedObjects) sharedObjects->share(bindDescriptorSet);

stateGroup->add(bindDescriptorSet);
}

if (useViewDependentState)
{
auto bindViewDescriptorSets = vsg::BindViewDescriptorSets::create(VK_PIPELINE_BIND_POINT_GRAPHICS, config->layout, 1);
if (sharedObjects) sharedObjects->share(bindViewDescriptorSets);
stateGroup->add(bindViewDescriptorSets);
}

// assign any custom ArrayState that may be required.
stateGroup->prototypeArrayState = config->shaderSet->getSuitableArrayState(config->shaderHints->defines);
config->copyTo(stateGroup, sharedObjects);

stateGroup->addChild(vid);

if (material.blending)
if (material->blending)
{
vsg::ComputeBounds computeBounds;
vid->accept(computeBounds);
Expand Down Expand Up @@ -1018,6 +1005,7 @@ vsg::ref_ptr<vsg::Object> assimp::Implementation::read(const vsg::Path& filename
opt->paths.insert(opt->paths.begin(), vsg::filePath(filenameToUse));

SceneConverter converter;
converter.filename = filename;
return converter.visit(scene, opt, ext);
}
else
Expand Down