diff options
Diffstat (limited to 'assetFactory')
| -rw-r--r-- | assetFactory/asset.h | 2 | ||||
| -rw-r--r-- | assetFactory/assetFactory.cpp | 2 | ||||
| -rw-r--r-- | assetFactory/assimp.cpp | 4 | ||||
| -rw-r--r-- | assetFactory/faceController.cpp | 4 | ||||
| -rw-r--r-- | assetFactory/factoryMesh.cpp | 4 | ||||
| -rw-r--r-- | assetFactory/factoryMesh.h | 2 | ||||
| -rw-r--r-- | assetFactory/object.h | 2 | ||||
| -rw-r--r-- | assetFactory/shape.cpp | 2 | ||||
| -rw-r--r-- | assetFactory/shape.h | 2 | ||||
| -rw-r--r-- | assetFactory/textureFragment.h | 2 | ||||
| -rw-r--r-- | assetFactory/texturePacker.cpp | 2 | ||||
| -rw-r--r-- | assetFactory/use.cpp | 2 | ||||
| -rw-r--r-- | assetFactory/use.h | 2 |
13 files changed, 16 insertions, 16 deletions
diff --git a/assetFactory/asset.h b/assetFactory/asset.h index dba4974..5bdd2f2 100644 --- a/assetFactory/asset.h +++ b/assetFactory/asset.h @@ -2,7 +2,7 @@ #include "factoryMesh.h" #include "persistence.h" -#include <stdTypeDefs.hpp> +#include <stdTypeDefs.h> class TextureAtlas; diff --git a/assetFactory/assetFactory.cpp b/assetFactory/assetFactory.cpp index af0cd54..218c4e7 100644 --- a/assetFactory/assetFactory.cpp +++ b/assetFactory/assetFactory.cpp @@ -1,5 +1,5 @@ #include "assetFactory.h" -#include "collections.hpp" +#include "collections.h" #include "cuboid.h" #include "cylinder.h" #include "filesystem.h" diff --git a/assetFactory/assimp.cpp b/assetFactory/assimp.cpp index 74b1c54..9dc7842 100644 --- a/assetFactory/assimp.cpp +++ b/assetFactory/assimp.cpp @@ -1,7 +1,7 @@ #include "assimp.h" #include "assetFactory.h" -#include "collections.hpp" -#include "ptr.hpp" +#include "collections.h" +#include "ptr.h" #include "resource.h" #include <assimp/cimport.h> #include <assimp/postprocess.h> diff --git a/assetFactory/faceController.cpp b/assetFactory/faceController.cpp index b305f1c..d045b3c 100644 --- a/assetFactory/faceController.cpp +++ b/assetFactory/faceController.cpp @@ -1,8 +1,8 @@ #include "faceController.h" -#include "collections.hpp" +#include "collections.h" #include "maths.h" #include "modelFactoryMesh.h" -#include "ray.hpp" +#include "ray.h" void FaceController::apply(ModelFactoryMesh & mesh, const StyleStack & parents, const std::string & names, diff --git a/assetFactory/factoryMesh.cpp b/assetFactory/factoryMesh.cpp index 784179f..46bcf6f 100644 --- a/assetFactory/factoryMesh.cpp +++ b/assetFactory/factoryMesh.cpp @@ -1,6 +1,6 @@ #include "factoryMesh.h" -#include "collections.hpp" -#include "gfx/models/vertex.hpp" +#include "collections.h" +#include "gfx/models/vertex.h" #include "modelFactoryMesh.h" Mesh::Ptr diff --git a/assetFactory/factoryMesh.h b/assetFactory/factoryMesh.h index bbeb870..f71c737 100644 --- a/assetFactory/factoryMesh.h +++ b/assetFactory/factoryMesh.h @@ -1,7 +1,7 @@ #pragma once #include "gfx/models/mesh.h" -#include "stdTypeDefs.hpp" +#include "stdTypeDefs.h" #include "use.h" class FactoryMesh : public Persistence::Persistable, public StdTypeDefs<FactoryMesh> { diff --git a/assetFactory/object.h b/assetFactory/object.h index 3f7b640..f47c512 100644 --- a/assetFactory/object.h +++ b/assetFactory/object.h @@ -2,7 +2,7 @@ #include "persistence.h" #include "shape.h" -#include "stdTypeDefs.hpp" +#include "stdTypeDefs.h" #include "use.h" class Object : public StdTypeDefs<Object>, public Shape, public Persistence::Persistable { diff --git a/assetFactory/shape.cpp b/assetFactory/shape.cpp index 3261354..1bfbdbb 100644 --- a/assetFactory/shape.cpp +++ b/assetFactory/shape.cpp @@ -1,5 +1,5 @@ #include "shape.h" -#include "gfx/models/vertex.hpp" +#include "gfx/models/vertex.h" #include "maths.h" #include "modelFactoryMesh.h" #include "shape.h" diff --git a/assetFactory/shape.h b/assetFactory/shape.h index fe517c1..ea3e4e7 100644 --- a/assetFactory/shape.h +++ b/assetFactory/shape.h @@ -1,7 +1,7 @@ #pragma once #include "modelFactoryMesh_fwd.h" -#include "stdTypeDefs.hpp" +#include "stdTypeDefs.h" #include <OpenMesh/Core/Mesh/Handles.hh> #include <glm/vec3.hpp> #include <map> diff --git a/assetFactory/textureFragment.h b/assetFactory/textureFragment.h index e6f07f3..6c99fee 100644 --- a/assetFactory/textureFragment.h +++ b/assetFactory/textureFragment.h @@ -3,7 +3,7 @@ #include "gfx/image.h" #include "gfx/models/texture.h" #include "persistence.h" -#include "stdTypeDefs.hpp" +#include "stdTypeDefs.h" #include "worker.h" class TextureFragment : public Persistence::Persistable, public StdTypeDefs<TextureFragment> { diff --git a/assetFactory/texturePacker.cpp b/assetFactory/texturePacker.cpp index fcc935f..1d533c1 100644 --- a/assetFactory/texturePacker.cpp +++ b/assetFactory/texturePacker.cpp @@ -1,5 +1,5 @@ #include "texturePacker.h" -#include "collections.hpp" +#include "collections.h" #include <GL/glew.h> #include <algorithm> #include <cstdio> diff --git a/assetFactory/use.cpp b/assetFactory/use.cpp index 9db3495..5314321 100644 --- a/assetFactory/use.cpp +++ b/assetFactory/use.cpp @@ -4,7 +4,7 @@ #include <glm/matrix.hpp> #include <maths.h> #include <set> -#include <stream_support.hpp> +#include <stream_support.h> Shape::CreatedFaces Use::createMesh(ModelFactoryMesh & mesh, float levelOfDetailFactor) const diff --git a/assetFactory/use.h b/assetFactory/use.h index 9dbf382..a91685b 100644 --- a/assetFactory/use.h +++ b/assetFactory/use.h @@ -4,7 +4,7 @@ #include "modelFactoryMesh_fwd.h" #include "persistence.h" #include "shape.h" -#include "stdTypeDefs.hpp" +#include "stdTypeDefs.h" #include "style.h" class Use : public StdTypeDefs<Use>, public Mutation, public Style, public Persistence::Persistable { |