X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fline.hh;fp=src%2FMoof%2FLine.hh;h=b40e7cf8c7c8190c9bb59ef5c8d566cda17edc65;hp=679e564fb378964c46c328d2a136c4ac54df917b;hb=831f04d4bc19a390415ac0bbac4331c7a65509bc;hpb=299af4f2047e767e5d79501c26444473bda64c64 diff --git a/src/Moof/Line.hh b/src/moof/line.hh similarity index 55% rename from src/Moof/Line.hh rename to src/moof/line.hh index 679e564..b40e7cf 100644 --- a/src/Moof/Line.hh +++ b/src/moof/line.hh @@ -12,68 +12,74 @@ #ifndef _MOOF_LINE_HH_ #define _MOOF_LINE_HH_ -#include -#include -#include -#include -#include -#include -#include -#include -#include +/** + * \file line.hh + * Classes related to line segments. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include -namespace Mf { + +namespace moof { template -struct Line : public Drawable, public Shape +struct line : public drawable, public shape { - typedef cml::vector< Scalar, cml::fixed > Vector; + typedef moof::vector< scalar, fixed > vector; + - Vector a; - Vector b; + vector a; + vector b; - Line() {} + line() {} - Line(const Vector& point1, const Vector& point2) : + line(const vector& point1, const vector& point2) : a(point1), b(point2) {} - Vector getDirection() const + vector direction() const { return b - a; } - Scalar getLength() const + scalar length() const { - return getDirection().length(); + return direction().length(); } - bool intersect(const Line& other, Contact& hit) const + bool intersect(const line& other, contact& hit) const { - Scalar d = (other.b[1] - other.a[1]) * (b[0] - a[0]) - + scalar d = (other.b[1] - other.a[1]) * (b[0] - a[0]) - (other.b[0] - other.a[0]) * (b[1] - a[1]); if (d == SCALAR(0.0)) return false; // lines are parallel // ignoring the (somewhat remote) possibility of coincidence - Scalar m = ((other.b[0] - other.a[0]) * (a[1] - other.a[1]) - + scalar m = ((other.b[0] - other.a[0]) * (a[1] - other.a[1]) - (other.b[1] - other.a[1]) * (a[0] - other.a[0])) / d; - Scalar n = ((b[0] - a[0]) * (b[1] - other.a[1]) - + scalar n = ((b[0] - a[0]) * (b[1] - other.a[1]) - (b[1] - a[1]) * (b[0] - other.a[0])) / d; if (m < SCALAR(0.0) || m > SCALAR(1.0) || // not intersecting n < SCALAR(0.0) || n > SCALAR(1.0)) return false; - Vector2 tangent = b - a; - Vector2 normal = cml::perp(tangent).normalize(); + vector2 tangent = b - a; + vector2 normal = perp(tangent).normalize(); - if (cml::dot(normal, other.a - other.b) < SCALAR(0.0)) + if (dot(normal, other.a - other.b) < SCALAR(0.0)) { normal = -normal; } @@ -85,15 +91,15 @@ struct Line : public Drawable, public Shape return true; } - bool intersect(const Sphere& other, Contact& hit) const + bool intersect(const sphere& other, contact& hit) const { - Vector surface = b - a; - Vector toPoint = other.point - a; + vector surface = b - a; + vector toPoint = other.point - a; - Scalar surfaceLength = surface.length(); + scalar surfaceLength = surface.length(); surface.normalize(); - Scalar projection = cml::dot(surface, toPoint); + scalar projection = dot(surface, toPoint); if (projection < SCALAR(0.0) || projection > surfaceLength) { @@ -115,10 +121,10 @@ struct Line : public Drawable, public Shape return false; } - Vector point = a + surface * projection; - Vector normal = other.point - point; + vector point = a + surface * projection; + vector normal = other.point - point; - Scalar distance = normal.length(); + scalar distance = normal.length(); if (distance > other.radius) false; // not intersecting @@ -132,14 +138,14 @@ struct Line : public Drawable, public Shape } - bool intersectRay(const Ray<2>& ray, Ray<2>::Contact& hit) const + bool intersect_ray(const ray<2>& ray, ray<2>::contact& hit) const { - Vector2 v1 = a - ray.point; - Scalar a1 = cml::signed_angle_2D(v1, b - ray.point); + vector2 v1 = a - ray.point; + scalar a1 = signed_angle_2D(v1, b - ray.point); - //logWarning << "angle:::::::::: " << a1 << std::endl; + //log_warning << "angle:::::::::: " << a1 << std::endl; - if (a1 == Constants::pi()) + if (a1 == constants::pi()) { hit.distance = 5.4321; return true; @@ -150,18 +156,18 @@ struct Line : public Drawable, public Shape return true; } - Scalar a2 = cml::signed_angle_2D(v1, ray.direction); + scalar a2 = signed_angle_2D(v1, ray.direction); if (a2 < SCALAR(0.0) || a2 > a1) return false; //hit.distance = 1.23456; - //hit.normal = Vector2(0.0, 0.0); + //hit.normal = vector2(0.0, 0.0); - Vector2 n = (b - a).normalize(); - Scalar z = cml::dot(ray.point - a, n); - Vector2 p = a + n * z; + vector2 n = (b - a).normalize(); + scalar z = dot(ray.point - a, n); + vector2 p = a + n * z; hit.distance = (ray.point - p).length(); - hit.normal = cml::perp(a - b); + hit.normal = perp(a - b); return true; @@ -174,19 +180,19 @@ struct Line : public Drawable, public Shape // C = ray.point // D = ray.direction - Scalar denom = ray.direction[0] * (b[1] - a[1]) + + scalar denom = ray.direction[0] * (b[1] - a[1]) + ray.direction[1] * (a[0] - b[0]); // check if the ray and line are parallel - //if (isEqual(denom, SCALAR(0.0))) + //if (is_equal(denom, SCALAR(0.0))) if (denom == SCALAR(0.0)) { - Scalar numer = a[0] * (ray.point[1] - b[1]) + + scalar numer = a[0] * (ray.point[1] - b[1]) + b[0] * (a[1] - ray.point[1]) + ray.point[0] * (b[1] - a[1]); // check if they are collinear - if (isEqual(numer, SCALAR(0.0))) + if (is_equal(numer, SCALAR(0.0))) { hit.distance = SCALAR(0.0); hit.normal.set(0.0, 0.0); @@ -196,7 +202,7 @@ struct Line : public Drawable, public Shape return false; } - Scalar s = (ray.direction[0] * (ray.point[1] - a[1]) + + scalar s = (ray.direction[0] * (ray.point[1] - a[1]) + ray.direction[1] * (a[0] - ray.point[0])) / denom; // check if the ray hits the segment @@ -209,17 +215,17 @@ struct Line : public Drawable, public Shape // check if the intersection is behind the ray if (hit.distance < SCALAR(0.0)) return false; - Vector normal = cml::perp(a - b); - if (cml::dot(a - ray.point, normal) < 0) hit.normal = normal; + vector normal = perp(a - b); + if (dot(a - ray.point, normal) < 0) hit.normal = normal; else hit.normal = -normal; return true; */ } - void draw(Scalar alpha = 0.0) const + void draw(scalar alpha = 0.0) const { - Mf::Texture::resetBind(); + texture::reset_binding(); glBegin(GL_LINES); glVertex(a); glVertex(b); @@ -228,27 +234,27 @@ struct Line : public Drawable, public Shape }; -typedef Line<2> Line2; -typedef Line<3> Line3; +typedef line<2> line2; +typedef line<3> line3; template -struct Polygon : public Drawable, public Shape +struct polygon : public drawable, public shape { - typedef cml::vector< Scalar, cml::fixed > Vector; + typedef moof::vector< scalar, fixed > vector; - Vector points[N]; + vector points[N]; - Polygon() {} + polygon() {} - bool intersectRay(const Ray& ray, typename Ray::Contact& hit) + bool intersect_ray(const ray& ray, typename ray::contact& hit) { return false; } - void draw(Scalar alpha = 0.0) const + void draw(scalar alpha = 0.0) const { - Mf::Texture::resetBind(); + texture::reset_binding(); glBegin(GL_POLYGON); for (int i = 0; i < D; ++i) { @@ -259,19 +265,19 @@ struct Polygon : public Drawable, public Shape }; -typedef Polygon<2,3> Triangle2; -typedef Polygon<3,3> Triangle3; +typedef polygon<2,3> triangle2; +typedef polygon<3,3> triangle3; template -bool intersect(const Line& line, const Sphere& sphere, - Contact& hit) +bool intersect(const line& line, const sphere& sphere, + contact& hit) { return false; } -} // namespace Mf +} // namespace moof #endif // _MOOF_LINE_HH_