Skip to content
Snippets Groups Projects
Commit a022e7ea authored by aboensch's avatar aboensch
Browse files

delete prefix 'generic' in filename

issue #485
parent 970e9c13
No related branches found
No related tags found
1 merge request!154Feature/#485 notion separation of loaders and generators
......@@ -20,7 +20,7 @@
// limitations under the License.
//------------------------------------------------------------------------------
#include "phx/resources/generators/generic_material_generator.hpp"
#include "phx/resources/generators/material_generator.hpp"
#include <memory>
#include <vector>
......@@ -28,7 +28,7 @@
#include "phx/resources/types/material.hpp"
namespace phx {
std::unique_ptr<Resource> GenericMaterialGenerator::Load(
std::unique_ptr<Resource> MaterialGenerator::Load(
const ResourceDeclaration& declaration) {
auto resource = std::make_unique<phx::Material>();
......
......@@ -20,28 +20,27 @@
// limitations under the License.
//------------------------------------------------------------------------------
#ifndef LIBRARY_PHX_RESOURCES_GENERATORS_GENERIC_MATERIAL_GENERATOR_HPP_
#define LIBRARY_PHX_RESOURCES_GENERATORS_GENERIC_MATERIAL_GENERATOR_HPP_
#ifndef LIBRARY_PHX_RESOURCES_GENERATORS_MATERIAL_GENERATOR_HPP_
#define LIBRARY_PHX_RESOURCES_GENERATORS_MATERIAL_GENERATOR_HPP_
#include <memory>
#include "phx/resources/resource_load_strategy.hpp"
namespace phx {
class GenericMaterialGenerator final : public ResourceLoadStrategy {
class MaterialGenerator final : public ResourceLoadStrategy {
public:
GenericMaterialGenerator() = default;
GenericMaterialGenerator(const GenericMaterialGenerator &) = delete;
GenericMaterialGenerator(GenericMaterialGenerator &&) = delete;
~GenericMaterialGenerator() = default;
MaterialGenerator() = default;
MaterialGenerator(const MaterialGenerator &) = delete;
MaterialGenerator(MaterialGenerator &&) = delete;
~MaterialGenerator() = default;
GenericMaterialGenerator &operator=(const GenericMaterialGenerator &) =
delete;
GenericMaterialGenerator &operator=(GenericMaterialGenerator &&) = delete;
MaterialGenerator &operator=(const MaterialGenerator &) = delete;
MaterialGenerator &operator=(MaterialGenerator &&) = delete;
std::unique_ptr<Resource> Load(
const ResourceDeclaration &declaration) override;
};
} // namespace phx
#endif // LIBRARY_PHX_RESOURCES_GENERATORS_GENERIC_MATERIAL_GENERATOR_HPP_
#endif // LIBRARY_PHX_RESOURCES_GENERATORS_MATERIAL_GENERATOR_HPP_
......@@ -96,7 +96,7 @@ void ResourceManager::RegisterImageResourceExtensions() {
void ResourceManager::RegisterResourceGenerators() {
this->RegisterResourceType("GEN_MATERIAL",
std::make_unique<GenericMaterialGenerator>());
std::make_unique<MaterialGenerator>());
}
} // namespace phx
......@@ -28,7 +28,7 @@
#include "test_utilities/glm_vec.hpp"
SCENARIO("The Generic Material Loader can create Generic materials.",
"[phx][phx::GenericMaterialGenerator]") {
"[phx][phx::MaterialGenerator]") {
GIVEN("A plain Generic Material Generator") {
WHEN("We load a red material") {
auto materialResource = phx::ResourceUtils::LoadGenericMaterial(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment