From e8de9303955c4c799e230a6f94ad7316f841197b Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 21 Sep 2009 23:44:02 +0200 Subject: [PATCH] ...still broken --- geotypes.cpp | 4 ++-- geotypes.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/geotypes.cpp b/geotypes.cpp index 0f5c4f9..4b91334 100644 --- a/geotypes.cpp +++ b/geotypes.cpp @@ -139,11 +139,11 @@ float Ray::dist(Punkt3D p) const { return abs(p - get( getParam(p) )); } -int getIntersectionParam(const std::Ray &ray, float *param1, float *param2) { +int getIntersectionParam(const Ray &ray, float *param1, float *param2) { } -int getIntersectionParam(const std::Ray &ray, segl::Punkt3D *a, segl::Punkt3D *b) { +int getIntersectionParam(const Ray &ray, segl::Punkt3D *a, segl::Punkt3D *b) { } diff --git a/geotypes.h b/geotypes.h index 0631dd8..922aebe 100644 --- a/geotypes.h +++ b/geotypes.h @@ -66,6 +66,9 @@ class Ray { float dist(Punkt3D p) const; float getParam(Punkt3D p, bool onray=false) const; + int getIntersectionParam(const Ray &ray, float *param1, float *param2); + int getIntersectionParam(const Ray &ray, segl::Punkt3D *a, segl::Punkt3D *b); + bool collision(const Sphere &s) const; bool collision(const Ray &r) const; bool collision(const Box & b) const;