suzanne.soy/2011-m2s3-city-builder
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Suppression d'une fonction 2D qui n'était plus utilisée.

Browse Source
This commit is contained in:
Georges Dupéron 2012-01-18 16:57:54 +01:00
parent 876fe13a48
commit 15626bfe90
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
geometry/vertex.cpp
View File

@ -10,19 +10,6 @@ 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); } float Vertex::norm() const { return std::sqrt(x*x + y*y + z*z); }
// TODO : Ce code ne marche qu'en 2D !
Vertex intersection(Vertex a, Vertex b, Vertex c, Vertex d) {
// Note : si les deux lignes sont parallèles, on risque fort
// d'avoir une division par zéro.
// http://en.wikipedia.org/wiki/Line-line_intersection
float denominator = ((a.x-b.x)*(c.y-d.y) - (a.y-b.y)*(c.x-d.x));
return Vertex(
((a.x*b.y-a.y*b.x)*(c.x-d.x) - (a.x-b.x)*(c.x*d.y-c.y*d.x)) / denominator,
((a.x*b.y-a.y*b.x)*(c.y-d.y) - (a.y-b.y)*(c.x*d.y-c.y*d.x)) / denominator,
0
);
}
Vertex Vertex::projectOn(Vertex v) const { Vertex Vertex::projectOn(Vertex v) const {
// http://www.developpez.net/forums/d202580/applications/developpement-2d-3d-jeux/contribuez/faq-mat-quat-ajout-calculs-vectoriels/ // http://www.developpez.net/forums/d202580/applications/developpement-2d-3d-jeux/contribuez/faq-mat-quat-ajout-calculs-vectoriels/
float scalaire = (this->x)*(v.x) + (this->y)*(v.y) + (this->z)*(v.z); float scalaire = (this->x)*(v.x) + (this->y)*(v.y) + (this->z)*(v.z);

1
geometry/vertex.hh
View File

@ -18,7 +18,6 @@ class Vertex {
float cosAngle(Vertex v) const; // cosinus de l'angle entre this et v. float cosAngle(Vertex v) const; // cosinus de l'angle entre this et v.
float angle(Vertex v) const; // Angle entre this et v. float angle(Vertex v) const; // Angle entre this et v.
static Vertex fromSpherical(float r, float xAngle, float yAngle); static Vertex fromSpherical(float r, float xAngle, float yAngle);
friend Vertex intersection(Vertex a, Vertex b, Vertex c, Vertex d); // Intersection entre (a,b) et (c,d).
public : public :
friend std::ostream& operator<<(std::ostream& os, const Vertex& v); friend std::ostream& operator<<(std::ostream& os, const Vertex& v);