Commit e8f98f4e authored by Romain Pacanowski's avatar Romain Pacanowski

Fixed path inclusion for mrf

parent 8863aae6
#include "geometry/computation.hpp"
#include "mrf/geometry/computation.hpp"
//STL
#include <vector>
#include <iostream>
#include "math/math.hpp"
#include "mrf/math/math.hpp"
using namespace mrf::math;
......@@ -16,7 +16,7 @@ namespace geom
void
Computation::computeNormals( float * vertices,
unsigned int num_of_vertices,
unsigned int * index_faces,
unsigned int const * index_faces,
unsigned int num_of_faces,
float ** normals)
{
......
......@@ -29,7 +29,7 @@ class MRF_EXPORT Computation
public:
static void computeNormals( float * vertices,
unsigned int num_of_vertices,
unsigned int * index_faces,
unsigned int const * index_faces,
unsigned int num_of_faces,
float ** normals);
......
#include "geometry/direction.hpp"
#include "mrf/geometry/direction.hpp"
namespace mrf
{
......
......@@ -11,7 +11,7 @@
#include "mrf/mrf_dll.hpp"
#include "mrf/mrf_types.hpp"
#include "lighting/i_light.hpp"
#include "mrf/lighting/i_light.hpp"
namespace mrf
{
......
......@@ -10,7 +10,7 @@
#include "mrf/mrf_types.hpp"
#include "math/math.hpp"
#include "mrf/math/math.hpp"
namespace mrf
{
......
#include "geometry/object.hpp"
#include "mrf/geometry/object.hpp"
namespace mrf
{
......
#include "geometry/point.hpp"
#include "geometry/aabbox.hpp"
#include "mrf/geometry/point.hpp"
#include "mrf/geometry/aabbox.hpp"
namespace mrf
{
......
......@@ -11,8 +11,8 @@
#include "mrf/mrf_dll.hpp"
#include "mrf/mrf_types.hpp"
#include "math/vec3.hpp"
#include "lighting/i_light.hpp"
#include "mrf/math/vec3.hpp"
#include "mrf/lighting/i_light.hpp"
namespace mrf
......
#include "geometry/quad.hpp"
#include "math/math.hpp"
#include "geometry/mesh.hpp"
#include "mrf/geometry/quad.hpp"
#include "mrf/math/math.hpp"
#include "mrf/geometry/mesh.hpp"
......
......@@ -11,10 +11,10 @@
#include "mrf/mrf_dll.hpp"
#include "mrf/mrf_types.hpp"
#include "math/vec3.hpp"
#include "lighting/i_light.hpp"
#include "geometry/shape.hpp"
#include "geometry/meshable.hpp"
#include "mrf/math/vec3.hpp"
#include "mrf/lighting/i_light.hpp"
#include "mrf/geometry/shape.hpp"
#include "mrf/geometry/meshable.hpp"
namespace mrf
{
......
#include "geometry/shape.hpp"
#include "mrf/geometry/shape.hpp"
......
......@@ -16,10 +16,10 @@
#include <memory>
//MRF
#include "geometry/object.hpp"
#include "geometry/intersectable.hpp"
#include "geometry/mesh.hpp"
#include "math/math.hpp"
#include "mrf/geometry/object.hpp"
#include "mrf/geometry/intersectable.hpp"
#include "mrf/geometry/mesh.hpp"
#include "mrf/math/math.hpp"
namespace mrf
{
......
#include "geometry/sphere.hpp"
#include "math/math.hpp"
#include "mrf/geometry/sphere.hpp"
#include "mrf/math/math.hpp"
using namespace mrf::math;
......
......@@ -13,12 +13,12 @@
//MRF
#include "geometry/shape.hpp"
#include "geometry/meshable.hpp"
#include "geometry/mesh.hpp"
#include "geometry/local_frame.hpp"
#include "lighting/i_light.hpp"
#include "math/vec3.hpp"
#include "mrf/geometry/shape.hpp"
#include "mrf/geometry/meshable.hpp"
#include "mrf/geometry/mesh.hpp"
#include "mrf/geometry/local_frame.hpp"
#include "mrf/lighting/i_light.hpp"
#include "mrf/math/vec3.hpp"
namespace mrf
......
......@@ -13,9 +13,9 @@
//MRF
#include "geometry/aabbox.hpp"
#include "geometry/local_frame.hpp"
#include "math/math.hpp"
#include "mrf/geometry/aabbox.hpp"
#include "mrf/geometry/local_frame.hpp"
#include "mrf/math/math.hpp"
namespace mrf
......
......@@ -14,4 +14,4 @@ typedef unsigned int uint;
typedef unsigned char uchar;
typedef std::tuple<uint, uint, uint> Triplet_uint;
typedef std::tuple<int, int, int> Triplet_int;
};
\ No newline at end of file
}
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment