Skip to content

[glTF] Removed unused GltfLoader methods #610

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

Open
footballhead wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[glTF] Removed unused GltfLoader methods #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
108 changes: 0 additions & 108 deletions include/ppx/scene/scene_gltf_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,113 +92,6 @@ class GltfLoader
int32_t GetNodeIndex(const std::string& name) const;
int32_t GetSceneIndex(const std::string& name) const;

// ---------------------------------------------------------------------------------------------
// Loads a GLTF sampler, image, texture, or material
//
// These load functions create standalone objects that can be used
// outside of a scene. Caching is not used.
//
// ---------------------------------------------------------------------------------------------
ppx::Result LoadSampler(
grfx::Device* pDevice,
uint32_t samplerIndex,
scene::Sampler** ppTargetSampler);

ppx::Result LoadSampler(
grfx::Device* pDevice,
const std::string& samplerName,
scene::Sampler** ppTargetSampler);

ppx::Result LoadImage(
grfx::Device* pDevice,
uint32_t imageIndex,
scene::Image** ppTargetImage);

ppx::Result LoadImage(
grfx::Device* pDevice,
const std::string& imageName,
scene::Image** ppTargetImage);

ppx::Result LoadTexture(
grfx::Device* pDevice,
uint32_t textureIndex,
scene::Texture** ppTargetTexture);

ppx::Result LoadTexture(
grfx::Device* pDevice,
const std::string& textureName,
scene::Texture** ppTargetTexture);

ppx::Result LoadMaterial(
grfx::Device* pDevice,
uint32_t materialIndex,
scene::Material** ppTargetMaterial,
const scene::LoadOptions& loadOptions = scene::LoadOptions());

ppx::Result LoadMaterial(
grfx::Device* pDevice,
const std::string& materialName,
scene::Material** ppTargetMaterial,
const scene::LoadOptions& loadOptions = scene::LoadOptions());

// ---------------------------------------------------------------------------------------------
// Loads a GLTF mesh
//
// This function creates a standalone mesh that usable outside of a scene.
//
// Standalone meshes uses an internal scene::ResourceManager to
// manage its required objects. All required objects created as apart
// of the mesh loading will be managed by the mesh. The reasoning
// for this is because images, textures, and materials can be shared
// between primitive batches.
//
// Object sharing requires that the lifetime of an object to be managed
// by an external mechanism, scene::ResourceManager. When a mesh is
// destroyed, its destructor calls scene::ResourceManager::DestroyAll
// to destroy its reference to the shared objects. If afterwards a shared
// object has an external reference, the code holding the reference
// is responsible for the shared objct.
//
// activeVertexAttributes - specifies the attributes that the a mesh
// should be created with. If a GLTF file doesn't provide data for
// an attribute, an sensible default value is used - usually zeroes.
//
// ---------------------------------------------------------------------------------------------
ppx::Result LoadMesh(
grfx::Device* pDevice,
uint32_t meshIndex,
scene::Mesh** ppTargetMesh,
const scene::LoadOptions& loadOptions = scene::LoadOptions());

ppx::Result LoadMesh(
grfx::Device* pDevice,
const std::string& meshName,
scene::Mesh** ppTargetMesh,
const scene::LoadOptions& loadOptions = scene::LoadOptions());

// ---------------------------------------------------------------------------------------------
// Loads a GLTF node
// ---------------------------------------------------------------------------------------------
ppx::Result LoadNode(
grfx::Device* pDevice,
uint32_t nodeIndex,
scene::Node** ppTargetNode,
const scene::LoadOptions& loadOptions = scene::LoadOptions());

ppx::Result LoadNode(
grfx::Device* pDevice,
const std::string& nodeName,
scene::Node** ppTargetNode,
const scene::LoadOptions& loadOptions = scene::LoadOptions());

ppx::Result LoadNodeTransformOnly(
uint32_t nodeIndex,
scene::Node** ppTargetNode);

ppx::Result LoadNodeTransformOnly(
const std::string& nodeName,
scene::Node** ppTargetNode);

// ---------------------------------------------------------------------------------------------
// Loads a GLTF scene
//
Expand Down Expand Up @@ -248,7 +141,6 @@ class GltfLoader
{
grfx::Device* pDevice = nullptr;
scene::MaterialFactory* pMaterialFactory = nullptr;
scene::VertexAttributeFlags requiredVertexAttributes = scene::VertexAttributeFlags::None();
scene::ResourceManager* pResourceManager = nullptr;
MeshMaterialVertexAttributeMasks* pMeshMaterialVertexAttributeMasks = nullptr;
bool transformOnly = false;
Expand Down
23 changes: 0 additions & 23 deletions include/ppx/scene/scene_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,32 +45,9 @@ class LoadOptions
return *this;
}

// Returns true if the calling application requires a specific set of attrbutes
bool HasRequiredVertexAttributes() const { return (mRequiredVertexAttributes.mask != 0); }

// Returns the attributes that the calling application rquires or none if attributes has not been set.
const scene::VertexAttributeFlags& GetRequiredAttributes() const { return mRequiredVertexAttributes; }

// Set attributes required by calling allication.
LoadOptions& SetRequiredAttributes(const scene::VertexAttributeFlags& attributes)
{
mRequiredVertexAttributes = attributes;
return *this;
}

// Clears required attributes (sets required attributs to none)
void ClearRequiredAttributes() { SetRequiredAttributes(scene::VertexAttributeFlags::None()); }

private:
// Pointer to custom material factory for loader to use.
scene::MaterialFactory* mMaterialFactory = nullptr;

// Required attributes for meshes nodes, meshes - this should override
// whatever a loader is using to determine which vertex attributes to laod.
// If the source data doesn't provide data for an attribute, an sensible
// default value is used - usually zeroes.
//
scene::VertexAttributeFlags mRequiredVertexAttributes = scene::VertexAttributeFlags::None();
};

} // namespace scene
Expand Down
Loading
Loading