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

Fix includes and macros

issue #485
parent 39f07028
No related branches found
No related tags found
1 merge request!154Feature/#485 notion separation of loaders and generators
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
// limitations under the License. // limitations under the License.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#include "phx/resources/loaders/generic_material_loader.hpp" #include "phx/resources/generators/generic_material_generator.hpp"
#include <memory> #include <memory>
#include <vector> #include <vector>
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
// limitations under the License. // limitations under the License.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#ifndef LIBRARY_PHX_RESOURCES_LOADERS_GENERIC_MATERIAL_LOADER_HPP_ #ifndef LIBRARY_PHX_RESOURCES_GENERATORS_GENERIC_MATERIAL_GENERATOR_HPP_
#define LIBRARY_PHX_RESOURCES_LOADERS_GENERIC_MATERIAL_LOADER_HPP_ #define LIBRARY_PHX_RESOURCES_GENERATORS_GENERIC_MATERIAL_GENERATOR_HPP_
#include <memory> #include <memory>
...@@ -44,4 +44,4 @@ class GenericMaterialGenerator final : public ResourceLoadStrategy { ...@@ -44,4 +44,4 @@ class GenericMaterialGenerator final : public ResourceLoadStrategy {
}; };
} // namespace phx } // namespace phx
#endif // LIBRARY_PHX_RESOURCES_LOADERS_GENERIC_MATERIAL_LOADER_HPP_ #endif // LIBRARY_PHX_RESOURCES_GENERATORS_GENERIC_MATERIAL_GENERATOR_HPP_
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include "phx/resources/generators/generic_material_generator.hpp"
#include "phx/resources/loaders/assimp_model_loader.hpp" #include "phx/resources/loaders/assimp_model_loader.hpp"
#include "phx/resources/loaders/generic_material_loader.hpp"
#include "phx/resources/loaders/image_loader.hpp" #include "phx/resources/loaders/image_loader.hpp"
#include "phx/resources/loaders/shader_loader.hpp" #include "phx/resources/loaders/shader_loader.hpp"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment