commit 8239cd8fbed2b1094caba10aefa4f37ec2613bcd parent 0016a66cbdac1220f450f6e677130cc8f4ab5b93 Author: Georges Dupéron <jahvascriptmaniac+github@free.fr> Date: Tue, 10 Jan 2012 03:14:21 +0100 On passe -ansi -pedantic -Wconversion -Wformat=2 -Winit-self -Wmissing-include-dirs -Wswitch-default -Wsync-nand -Wunused -Wstrict-overflow=5 -Wfloat-equal -Wundef -Wno-endif-labels -Wshadow -Wunsafe-loop-optimizations -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wlogical-op -Wmissing-declarations -Wnormalized=nfc -Wpacked -Wredundant-decls -Winline -Winvalid-pch -Wdisabled-optimization -Woverlength-strings . Diffstat:
35 files changed, 67 insertions(+), 59 deletions(-)
diff --git a/Makefile b/Makefile @@ -1,5 +1,6 @@ CXX=g++ # -ansi -pedantic -Wconversion +# -Wformat=2 -Winit-self -Wmissing-include-dirs -Wswitch-default -Wsync-nand -Wunused -Wstrict-overflow=5 -Wfloat-equal -Wundef -Wno-endif-labels -Wshadow -Wunsafe-loop-optimizations -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wlogical-op -Wmissing-declarations -Wnormalized=nfc -Wpacked -Wredundant-decls -Winline -Winvalid-pch -Wdisabled-optimization -Woverlength-strings CCWARN=-Wall -Wextra -Werror # TODO : -O3 -m32 ou -m64 # -g -rdynamic uniquement pour le debug. diff --git a/geometry/angle.cpp b/geometry/angle.cpp @@ -0,0 +1,4 @@ +#include "all_includes.hh" + +float Angle::r2d(float rad) { return rad / Pi * 180; } +float Angle::d2r(float deg) { return deg / 180 * Pi; } diff --git a/geometry/angle.hh b/geometry/angle.hh @@ -4,8 +4,8 @@ namespace Angle { const double dPi = 3.141592653589793238462643383279; const float Pi = (float)(dPi); - float r2d(float rad) { return rad / Pi * 180; } - float d2r(float deg) { return deg / 180 * Pi; } + float r2d(float rad); + float d2r(float deg); } #endif diff --git a/geometry/segment.cpp b/geometry/segment.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -Segment::Segment(Vertex u, Vertex v): u(u), v(v) {} +Segment::Segment(Vertex _u, Vertex _v): u(_u), v(_v) {} float Segment::length() { return (u-v).norm(); diff --git a/geometry/vertex.cpp b/geometry/vertex.cpp @@ -2,7 +2,7 @@ Vertex::Vertex() {} -Vertex::Vertex(float x, float y, float z): x(x), y(y), z(z) {} +Vertex::Vertex(float _x, float _y, float _z): x(_x), y(_y), z(_z) {} float Vertex::norm() const { return std::sqrt(x*x + y*y + z*z); } diff --git a/gputriangle.cpp b/gputriangle.cpp @@ -1,16 +1,16 @@ #include "all_includes.hh" -GPUTriangle::GPUTriangle(Vertex left, Vertex top, Vertex right, unsigned char r, unsigned char g, unsigned char b) - : c(left, top, right), r(r), g(g), b(b), vnormal(normal(left,top,right)) { +GPUTriangle::GPUTriangle(Vertex left, Vertex top, Vertex right, unsigned char _r, unsigned char _g, unsigned char _b) + : c(left, top, right), r(_r), g(_g), b(_b), vnormal(normal(left,top,right)) { } -GPUTriangle::GPUTriangle(Triangle c, unsigned char r, unsigned char g, unsigned char b) - : c(c), r(r), g(g), b(b), vnormal(normal(c[LEFT], c[TOP], c[RIGHT])) { +GPUTriangle::GPUTriangle(Triangle _c, unsigned char _r, unsigned char _g, unsigned char _b) + : c(_c), r(_r), g(_g), b(_b), vnormal(normal(c[LEFT], c[TOP], c[RIGHT])) { } Vertex GPUTriangle::normal(Vertex left, Vertex top, Vertex right) { - Vertex normal = (left - top)*(right - top); - return normal / normal.norm(); + Vertex v = (left - top)*(right - top); + return v / v.norm(); } void GPUTriangle::display() { diff --git a/heap.cpp b/heap.cpp @@ -3,7 +3,7 @@ Heap::Heap() bucketArraySize(1), lastNode(-1) { } -void Heap::init(int id, int factor) { this->id = id; this->factor = (float)factor; } +void Heap::init(int _id, int _factor) { this->id = _id; this->factor = (float)_factor; } void Heap::insert(float key, Chose* value) { ++lastNode; diff --git a/lod.cpp b/lod.cpp @@ -1,16 +1,16 @@ #include "all_includes.hh" -Lod::Lod(Vertex camera, Chose* root) { +Lod::Lod(Vertex _camera, Chose* root) { for (int i = 0; i < 6; i++) { merge[i].init(i, (i & 1) ? 1 : -1); splitIn[i].init(6+i, (i & 1) ? 1 : -1); splitOut[i].init(12+i, (i & 1) ? -1 : 1); } - this->camera[0] = camera.x; - this->camera[1] = camera.y; - this->camera[2] = camera.z; + this->camera[0] = _camera.x; + this->camera[1] = _camera.y; + this->camera[2] = _camera.z; addSplitCube(root); - setCamera(camera); + setCamera(_camera); } void Lod::setCamera(Vertex newCamera) { diff --git a/rules/batiment/batimentquad.cpp b/rules/batiment/batimentquad.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -BatimentQuad::BatimentQuad(Quad c, Cardinal entry) : Chose(), c(c), entry(entry) { +BatimentQuad::BatimentQuad(Quad _c, Cardinal _entry) : Chose(), c(_c), entry(_entry) { addEntropy(c); addEntropy(entry); } diff --git a/rules/batiment/batimentquadblock.cpp b/rules/batiment/batimentquadblock.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -BatimentQuadBlock::BatimentQuadBlock(Quad c, float height) : Chose(), c(c), height(height) { +BatimentQuadBlock::BatimentQuadBlock(Quad _c, float _height) : Chose(), c(_c), height(_height) { addEntropy(c); } diff --git a/rules/batiment/batimentquadfenetre.cpp b/rules/batiment/batimentquadfenetre.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -BatimentQuadFenetre::BatimentQuadFenetre(Quad c, float height) : Chose(), c(c), height(height) { +BatimentQuadFenetre::BatimentQuadFenetre(Quad _c, float _height) : Chose(), c(_c), height(_height) { addEntropy(c); } diff --git a/rules/batiment/batimentquadjardin.cpp b/rules/batiment/batimentquadjardin.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -BatimentQuadJardin::BatimentQuadJardin(Quad c) : Chose(), c(c) { +BatimentQuadJardin::BatimentQuadJardin(Quad _c) : Chose(), c(_c) { addEntropy(c); } diff --git a/rules/batiment/batimentquadmaison.cpp b/rules/batiment/batimentquadmaison.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -BatimentQuadMaison::BatimentQuadMaison(Quad c) : Chose(), c(c) { +BatimentQuadMaison::BatimentQuadMaison(Quad _c) : Chose(), c(_c) { addEntropy(c); } diff --git a/rules/batiment/batimentquadmaisonpont.cpp b/rules/batiment/batimentquadmaisonpont.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -BatimentQuadMaisonPont::BatimentQuadMaisonPont(Quad c, float height) : Chose(), c(c), height(height) { +BatimentQuadMaisonPont::BatimentQuadMaisonPont(Quad _c, float _height) : Chose(), c(_c), height(_height) { addEntropy(c); } diff --git a/rules/batiment/batimentquadmur.cpp b/rules/batiment/batimentquadmur.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -BatimentQuadMur::BatimentQuadMur(Quad c, float height) : Chose(), c(c), height(height) { +BatimentQuadMur::BatimentQuadMur(Quad _c, float _height) : Chose(), c(_c), height(_height) { addEntropy(c); this->window = false; } diff --git a/rules/batiment/batimentquadpont.cpp b/rules/batiment/batimentquadpont.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -BatimentQuadPont::BatimentQuadPont(Quad c, float height) : Chose(), c(c), height(height) { +BatimentQuadPont::BatimentQuadPont(Quad _c, float _height) : Chose(), c(_c), height(_height) { addEntropy(c); } @@ -9,12 +9,12 @@ void BatimentQuadPont::getBoundingBoxPoints() { addBBPoints(c + Vertex(0,0,height)); // TODO } -float ct(float x) { +float BatimentQuadPont::ct(float x) { return (float)(1 - cosh(x / 1.f)); } -float nt(float x, float height) { - return (ct(x) + -ct(-1.7f))/(ct(0)+ -ct(-1.7f)) * height; +float BatimentQuadPont::nt(float x, float _height) { + return (ct(x) + -ct(-1.7f))/(ct(0)+ -ct(-1.7f)) * _height; } void BatimentQuadPont::triangulation() { diff --git a/rules/batiment/batimentquadpont.hh b/rules/batiment/batimentquadpont.hh @@ -5,14 +5,17 @@ class BatimentQuadPont: public Chose { - private : +private : Quad c; float height; - public : +public : BatimentQuadPont(Quad c, float height); virtual void triangulation(); virtual void getBoundingBoxPoints(); +private: + float ct(float x); + float nt(float x, float height); }; #endif diff --git a/rules/batiment/batimentquadtoit.cpp b/rules/batiment/batimentquadtoit.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -BatimentQuadToit::BatimentQuadToit(Quad c, float height) : Chose(), c(c), height(height) { +BatimentQuadToit::BatimentQuadToit(Quad _c, float _height) : Chose(), c(_c), height(_height) { addEntropy(c); } diff --git a/rules/batiment/batimenttri.cpp b/rules/batiment/batimenttri.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -BatimentTri::BatimentTri(Triangle c) : Chose(), c(c) { +BatimentTri::BatimentTri(Triangle _c) : Chose(), c(_c) { addEntropy(c); } diff --git a/rules/quartier/quartierquad.cpp b/rules/quartier/quartierquad.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -QuartierQuad::QuartierQuad(Quad c) : Chose(), c(c) { +QuartierQuad::QuartierQuad(Quad _c) : Chose(), c(_c) { addEntropy(c); } diff --git a/rules/quartier/quartierquadangle.cpp b/rules/quartier/quartierquadangle.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -QuartierQuadAngle::QuartierQuadAngle(Quad c) : QuartierQuad(c) { +QuartierQuadAngle::QuartierQuadAngle(Quad _c) : QuartierQuad(_c) { } bool QuartierQuadAngle::split() { diff --git a/rules/quartier/quartierquadcarre.cpp b/rules/quartier/quartierquadcarre.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -QuartierQuadCarre::QuartierQuadCarre(Quad c) : QuartierQuad(c) { +QuartierQuadCarre::QuartierQuadCarre(Quad _c) : QuartierQuad(_c) { } bool QuartierQuadCarre::split() { diff --git a/rules/quartier/quartierquadrect.cpp b/rules/quartier/quartierquadrect.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -QuartierQuadRect::QuartierQuadRect(Quad c) : QuartierQuad(c) { +QuartierQuadRect::QuartierQuadRect(Quad _c) : QuartierQuad(_c) { } bool QuartierQuadRect::split() { diff --git a/rules/quartier/quartiertri.cpp b/rules/quartier/quartiertri.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -QuartierTri::QuartierTri(Triangle c) : Chose(), c(c) { +QuartierTri::QuartierTri(Triangle _c) : Chose(), c(_c) { addEntropy(c); } diff --git a/rules/quartier/quartiertricentre.cpp b/rules/quartier/quartiertricentre.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -QuartierTriCentre::QuartierTriCentre(Triangle c) : QuartierTri(c) { +QuartierTriCentre::QuartierTriCentre(Triangle _c) : QuartierTri(_c) { } bool QuartierTriCentre::split() { diff --git a/rules/quartier/quartiertrihauteur.cpp b/rules/quartier/quartiertrihauteur.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -QuartierTriHauteur::QuartierTriHauteur(Triangle c) : QuartierTri(c) { +QuartierTriHauteur::QuartierTriHauteur(Triangle _c) : QuartierTri(_c) { } bool QuartierTriHauteur::split() { diff --git a/rules/quartier/quartiertritrapeze.cpp b/rules/quartier/quartiertritrapeze.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -QuartierTriTrapeze::QuartierTriTrapeze(Triangle c) : QuartierTri(c) { +QuartierTriTrapeze::QuartierTriTrapeze(Triangle _c) : QuartierTri(_c) { } bool QuartierTriTrapeze::split() { diff --git a/rules/route/routequadcarrefour.cpp b/rules/route/routequadcarrefour.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -RouteQuadCarrefour::RouteQuadCarrefour(Quad c) : Chose(), c(c) { +RouteQuadCarrefour::RouteQuadCarrefour(Quad _c) : Chose(), c(_c) { addEntropy(c); } diff --git a/rules/route/routequadchaussee.cpp b/rules/route/routequadchaussee.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -RouteQuadChaussee::RouteQuadChaussee(Quad c) : Chose(), c(c) { +RouteQuadChaussee::RouteQuadChaussee(Quad _c) : Chose(), c(_c) { addEntropy(c); } diff --git a/rules/route/routetrichaussee.cpp b/rules/route/routetrichaussee.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -RouteTriChaussee::RouteTriChaussee(Triangle c) : Chose(), c(c) { +RouteTriChaussee::RouteTriChaussee(Triangle _c) : Chose(), c(_c) { addEntropy(c); } diff --git a/rules/route/trottoirquadnormal.cpp b/rules/route/trottoirquadnormal.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -TrottoirQuadNormal::TrottoirQuadNormal(Quad c, float height) : Chose(), c(c), height(height) { +TrottoirQuadNormal::TrottoirQuadNormal(Quad _c, float _height) : Chose(), c(_c), height(_height) { } void TrottoirQuadNormal::getBoundingBoxPoints() { diff --git a/rules/terrain/terrainquadherbe.cpp b/rules/terrain/terrainquadherbe.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -TerrainQuadHerbe::TerrainQuadHerbe(Quad c) : Chose(), c(c) { +TerrainQuadHerbe::TerrainQuadHerbe(Quad _c) : Chose(), c(_c) { addEntropy(c); } diff --git a/rules/terrain/terraintriherbe.cpp b/rules/terrain/terraintriherbe.cpp @@ -1,6 +1,6 @@ #include "all_includes.hh" -TerrainTriHerbe::TerrainTriHerbe(Triangle c) : Chose(), c(c) { +TerrainTriHerbe::TerrainTriHerbe(Triangle _c) : Chose(), c(_c) { addEntropy(c); } diff --git a/view.cpp b/view.cpp @@ -1,9 +1,9 @@ #include "all_includes.hh" -View::View(Chose* root) - : root(root), +View::View(Chose* _root) + : root(_root), camera(Camera(Vertex(9600,10000,15300),0,179,1000,0.6f)), - lod(camera.cameraCenter, root) { + lod(camera.cameraCenter, _root) { initWindow(); mainLoop(); } @@ -145,13 +145,13 @@ void View::mainLoop() { SDL_Quit(); } -Camera::Camera(Vertex pos, float xA, float yA, int moveSensitivity, float mouseSensitivity) - : cameraCenter(pos), - cameraSight(cameraCenter + Vertex::fromSpherical(100,yA,xA)), - xAngle(xA), - yAngle(yA), - moveDist(moveSensitivity), - mouseSensitivity(mouseSensitivity), +Camera::Camera(Vertex _cameraCenter, float _xAngle, float _yAngle, int _moveSensitivity, float _mouseSensitivity) + : cameraCenter(_cameraCenter), + cameraSight(cameraCenter + Vertex::fromSpherical(100,_yAngle,_xAngle)), + xAngle(_xAngle), + yAngle(_yAngle), + moveSensitivity(_moveSensitivity), + mouseSensitivity(_mouseSensitivity), up(false), down(false), left(false), right(false), pageUp(false), pageDown(false) { @@ -207,11 +207,11 @@ void Camera::keyboard(const SDL_KeyboardEvent &eventKey) { break; case 's': if (eventKey.type != SDL_KEYDOWN) break; - moveDist = std::min(50000,std::max(moveDist+1, moveDist*10/9)); + moveSensitivity = std::min(50000,std::max(moveSensitivity+1, moveSensitivity*10/9)); break; case 'x': if (eventKey.type != SDL_KEYDOWN) break; - moveDist = std::max(10, moveDist*9/10); + moveSensitivity = std::max(10, moveSensitivity*9/10); break; case 'p': // _Print _Position if (eventKey.type != SDL_KEYDOWN) break; @@ -225,7 +225,7 @@ void Camera::keyboard(const SDL_KeyboardEvent &eventKey) { } void Camera::animation(int elapsedTime) { - float diff = ((float)(elapsedTime+1)/1000.f)*(float)moveDist; + float diff = ((float)(elapsedTime+1)/1000.f)*(float)moveSensitivity; if(up) cameraCenter = cameraCenter + Vertex::fromSpherical(diff, yAngle, xAngle); diff --git a/view.hh b/view.hh @@ -17,7 +17,7 @@ class Camera { private : float xAngle; float yAngle; - int moveDist; + int moveSensitivity; float mouseSensitivity; bool up; bool down;