From 719990fe396d8a7652c4284c287a9e1efe64cd66 Mon Sep 17 00:00:00 2001 From: MrDev023 Date: Thu, 20 Oct 2016 21:22:38 +0200 Subject: [PATCH] Update --- .gitignore | 3 ++ main | Bin 49552 -> 0 bytes obj/main.o | Bin 99976 -> 0 bytes src/main.cpp | 10 ++---- src/raytracer.h | 83 ++++++++++++++++++++++++++++-------------------- 5 files changed, 54 insertions(+), 42 deletions(-) create mode 100644 .gitignore delete mode 100755 main delete mode 100644 obj/main.o diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f5006b8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +obj/* +main +main.exe \ No newline at end of file diff --git a/main b/main deleted file mode 100755 index d665e1925237c68b104c0f3cbb2040c8be50d4db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 49552 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 diff --git a/obj/main.o b/obj/main.o deleted file mode 100644 index 27b8fe64b5bf8b4734a2efa284d2ceb087340a2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99976 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

C%&k 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 diff --git a/src/main.cpp b/src/main.cpp index 6e487a3..7e16817 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,13 +1,7 @@ -#include -#include -#include -#include -#include -#include -using namespace std; - #include "raytracer.h" +using namespace std; + bool init(char* inputName, scene &myScene) { int nbMat, nbSphere, nbLight; diff --git a/src/raytracer.h b/src/raytracer.h index c8ff91d..3efc6d6 100644 --- a/src/raytracer.h +++ b/src/raytracer.h @@ -1,18 +1,53 @@ +#ifndef RAYTRACER_H +#define RAYTRACER_H - -struct point { - float x, y, z; -}; - -istream & operator >> ( istream &inputFile, point& p ) { - return inputFile >> p.x >> p.y >> p.z ; -} +#include +#include +#include +#include +#include +#include struct vecteur { float x, y, z; }; -istream & operator >> ( istream &inputFile, vecteur& v ) { +struct point { + float x, y, z; +}; + +struct ray { + point start; + vecteur dir; +}; + +struct material { + float red, green, blue, reflection; +}; + +struct sphere { + point pos; + float size; + int material; +}; + +struct light { + point pos; + float red, green, blue; +}; + +struct scene { + std::vector matTab; + std::vector sphTab; + std::vector lgtTab; + int sizex, sizey; +}; + +std::istream & operator >> ( std::istream &inputFile, point& p ) { + return inputFile >> p.x >> p.y >> p.z ; +} + +std::istream & operator >> ( std::istream &inputFile, vecteur& v ) { return inputFile >> v.x >> v.y >> v.z ; } @@ -46,38 +81,18 @@ float operator * (const vecteur&v1, const vecteur &v2 ) { return v1.x * v2.x + v1.y * v2.y + v1.z * v2.z; } -struct material { - float red, green, blue, reflection; -}; -istream & operator >> ( istream &inputFile, material& mat ) { +std::istream & operator >> ( std::istream &inputFile, material& mat ) { return inputFile >> mat.red >> mat.green >> mat.blue >> mat.reflection; } -struct sphere { - point pos; - float size; - int material; -}; -istream & operator >> ( istream &inputFile, sphere& sph ) { +std::istream & operator >> ( std::istream &inputFile, sphere& sph ) { return inputFile >> sph.pos >> sph.size >> sph.material; } -struct light { - point pos; - float red, green, blue; -}; -istream & operator >> ( istream &inputFile, light& lig ) { +std::istream & operator >> ( std::istream &inputFile, light& lig ) { return inputFile >> lig.pos >> lig.red >> lig.green >> lig.blue; } -struct ray { - point start; - vecteur dir; -}; -struct scene { - vector matTab; - vector sphTab; - vector lgtTab; - int sizex, sizey; -}; \ No newline at end of file + +#endif \ No newline at end of file