From a022e7eac7a82483ba5bf6c6606662dbed91313d Mon Sep 17 00:00:00 2001
From: aboensch <boensch@vr.rwth-aachen.de>
Date: Thu, 19 Jul 2018 10:19:54 +0200
Subject: [PATCH] delete prefix 'generic' in filename
issue #485
---
...l_generator.cpp => material_generator.cpp} | 4 ++--
...l_generator.hpp => material_generator.hpp} | 21 +++++++++----------
library/phx/resources/resource_manager.cpp | 2 +-
tests/src/test_generic_material_generator.cpp | 2 +-
4 files changed, 14 insertions(+), 15 deletions(-)
rename library/phx/resources/generators/{generic_material_generator.cpp => material_generator.cpp} (93%)
rename library/phx/resources/generators/{generic_material_generator.hpp => material_generator.hpp} (64%)
diff --git a/library/phx/resources/generators/generic_material_generator.cpp b/library/phx/resources/generators/material_generator.cpp
similarity index 93%
rename from library/phx/resources/generators/generic_material_generator.cpp
rename to library/phx/resources/generators/material_generator.cpp
index 54d3ce2a..2363f1ec 100644
--- a/library/phx/resources/generators/generic_material_generator.cpp
+++ b/library/phx/resources/generators/material_generator.cpp
@@ -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>();
diff --git a/library/phx/resources/generators/generic_material_generator.hpp b/library/phx/resources/generators/material_generator.hpp
similarity index 64%
rename from library/phx/resources/generators/generic_material_generator.hpp
rename to library/phx/resources/generators/material_generator.hpp
index bee8d9cf..267c8824 100644
--- a/library/phx/resources/generators/generic_material_generator.hpp
+++ b/library/phx/resources/generators/material_generator.hpp
@@ -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_
diff --git a/library/phx/resources/resource_manager.cpp b/library/phx/resources/resource_manager.cpp
index 7dd10bde..bacb1d18 100644
--- a/library/phx/resources/resource_manager.cpp
+++ b/library/phx/resources/resource_manager.cpp
@@ -96,7 +96,7 @@ void ResourceManager::RegisterImageResourceExtensions() {
void ResourceManager::RegisterResourceGenerators() {
this->RegisterResourceType("GEN_MATERIAL",
- std::make_unique<GenericMaterialGenerator>());
+ std::make_unique<MaterialGenerator>());
}
} // namespace phx
diff --git a/tests/src/test_generic_material_generator.cpp b/tests/src/test_generic_material_generator.cpp
index 811997e1..d26fa874 100644
--- a/tests/src/test_generic_material_generator.cpp
+++ b/tests/src/test_generic_material_generator.cpp
@@ -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(
--
GitLab