...still broken

master
Sebastian 15 years ago
parent 801a164446
commit e8de930395

@ -139,11 +139,11 @@ float Ray::dist(Punkt3D p) const {
return abs(p - get( getParam(p) )); 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) {
} }

@ -66,6 +66,9 @@ class Ray {
float dist(Punkt3D p) const; float dist(Punkt3D p) const;
float getParam(Punkt3D p, bool onray=false) 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 Sphere &s) const;
bool collision(const Ray &r) const; bool collision(const Ray &r) const;
bool collision(const Box & b) const; bool collision(const Box & b) const;

Loading…
Cancel
Save