Browse Source

...still broken

Sebastian 11 years ago
parent
commit
e8de930395
2 changed files with 5 additions and 2 deletions
  1. 2
    2
      geotypes.cpp
  2. 3
    0
      geotypes.h

+ 2
- 2
geotypes.cpp View File

@@ -139,11 +139,11 @@ float Ray::dist(Punkt3D p) const {
139 139
 	return abs(p - get( getParam(p) ));
140 140
 }
141 141
 
142
-int getIntersectionParam(const std::Ray &ray, float *param1, float *param2) {
142
+int getIntersectionParam(const Ray &ray, float *param1, float *param2) {
143 143
 
144 144
 }
145 145
 
146
-int getIntersectionParam(const std::Ray &ray, segl::Punkt3D *a, segl::Punkt3D *b) {
146
+int getIntersectionParam(const Ray &ray, segl::Punkt3D *a, segl::Punkt3D *b) {
147 147
 
148 148
 }
149 149
 

+ 3
- 0
geotypes.h View File

@@ -66,6 +66,9 @@ class Ray {
66 66
 		float dist(Punkt3D p) const;
67 67
 		float getParam(Punkt3D p, bool onray=false) const;
68 68
 		
69
+		int getIntersectionParam(const Ray &ray, float *param1, float *param2);
70
+		int getIntersectionParam(const Ray &ray, segl::Punkt3D *a, segl::Punkt3D *b);
71
+		
69 72
 		bool collision(const Sphere &s) const;
70 73
 		bool collision(const Ray &r) const;
71 74
 		bool collision(const Box & b) const;

Loading…
Cancel
Save