Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PACANOWSKI Romain
MRF
Commits
e8f98f4e
Commit
e8f98f4e
authored
Oct 29, 2019
by
Romain Pacanowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed path inclusion for mrf
parent
8863aae6
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
36 additions
and
36 deletions
+36
-36
mrf/geometry/computation.cpp
mrf/geometry/computation.cpp
+3
-3
mrf/geometry/computation.hpp
mrf/geometry/computation.hpp
+1
-1
mrf/geometry/direction.cpp
mrf/geometry/direction.cpp
+1
-1
mrf/geometry/direction.hpp
mrf/geometry/direction.hpp
+1
-1
mrf/geometry/local_frame.hpp
mrf/geometry/local_frame.hpp
+1
-1
mrf/geometry/object.cpp
mrf/geometry/object.cpp
+1
-1
mrf/geometry/point.cpp
mrf/geometry/point.cpp
+2
-2
mrf/geometry/point.hpp
mrf/geometry/point.hpp
+2
-2
mrf/geometry/quad.cpp
mrf/geometry/quad.cpp
+3
-3
mrf/geometry/quad.hpp
mrf/geometry/quad.hpp
+4
-4
mrf/geometry/shape.cpp
mrf/geometry/shape.cpp
+1
-1
mrf/geometry/shape.hpp
mrf/geometry/shape.hpp
+4
-4
mrf/geometry/sphere.cpp
mrf/geometry/sphere.cpp
+2
-2
mrf/geometry/sphere.hpp
mrf/geometry/sphere.hpp
+6
-6
mrf/lighting/i_light.hpp
mrf/lighting/i_light.hpp
+3
-3
mrf/mrf_types.hpp
mrf/mrf_types.hpp
+1
-1
No files found.
mrf/geometry/computation.cpp
View file @
e8f98f4e
#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
)
{
...
...
mrf/geometry/computation.hpp
View file @
e8f98f4e
...
...
@@ -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
);
...
...
mrf/geometry/direction.cpp
View file @
e8f98f4e
#include "geometry/direction.hpp"
#include "
mrf/
geometry/direction.hpp"
namespace
mrf
{
...
...
mrf/geometry/direction.hpp
View file @
e8f98f4e
...
...
@@ -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
{
...
...
mrf/geometry/local_frame.hpp
View file @
e8f98f4e
...
...
@@ -10,7 +10,7 @@
#include "mrf/mrf_types.hpp"
#include "math/math.hpp"
#include "
mrf/
math/math.hpp"
namespace
mrf
{
...
...
mrf/geometry/object.cpp
View file @
e8f98f4e
#include "geometry/object.hpp"
#include "
mrf/
geometry/object.hpp"
namespace
mrf
{
...
...
mrf/geometry/point.cpp
View file @
e8f98f4e
#include "geometry/point.hpp"
#include "geometry/aabbox.hpp"
#include "
mrf/
geometry/point.hpp"
#include "
mrf/
geometry/aabbox.hpp"
namespace
mrf
{
...
...
mrf/geometry/point.hpp
View file @
e8f98f4e
...
...
@@ -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
...
...
mrf/geometry/quad.cpp
View file @
e8f98f4e
#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"
...
...
mrf/geometry/quad.hpp
View file @
e8f98f4e
...
...
@@ -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
{
...
...
mrf/geometry/shape.cpp
View file @
e8f98f4e
#include "geometry/shape.hpp"
#include "
mrf/
geometry/shape.hpp"
...
...
mrf/geometry/shape.hpp
View file @
e8f98f4e
...
...
@@ -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
{
...
...
mrf/geometry/sphere.cpp
View file @
e8f98f4e
#include "geometry/sphere.hpp"
#include "math/math.hpp"
#include "
mrf/
geometry/sphere.hpp"
#include "
mrf/
math/math.hpp"
using
namespace
mrf
::
math
;
...
...
mrf/geometry/sphere.hpp
View file @
e8f98f4e
...
...
@@ -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
...
...
mrf/lighting/i_light.hpp
View file @
e8f98f4e
...
...
@@ -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
...
...
mrf/mrf_types.hpp
View file @
e8f98f4e
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment