From bbe317fb2bde1b2b88df66e5426c9ee78e40a0b6 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Thu, 16 Jul 2009 21:31:51 +0000 Subject: Have camera callbacks take canvas coordinates as doubles. --- libdimensionxx/camera.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'libdimensionxx/camera.cpp') diff --git a/libdimensionxx/camera.cpp b/libdimensionxx/camera.cpp index 3536e54..d483ba3 100644 --- a/libdimensionxx/camera.cpp +++ b/libdimensionxx/camera.cpp @@ -32,9 +32,9 @@ namespace Dimension // Return the result of the dmnsn_camera*'s ray callback Line - Camera::ray(const Canvas& canvas, unsigned int x, unsigned int y) + Camera::ray(double x, double y) { - return Line((*dmnsn()->ray_fn)(dmnsn(), canvas.dmnsn(), x, y)); + return Line((*dmnsn()->ray_fn)(dmnsn(), x, y)); } // Return the wrapped camera @@ -91,16 +91,10 @@ namespace Dimension // Custom camera callbacks namespace { dmnsn_line - ray_fn(const dmnsn_camera *camera, const dmnsn_canvas *canvas, - unsigned int x, unsigned int y) + ray_fn(const dmnsn_camera *camera, double x, double y) { Custom_Camera* ccamera = reinterpret_cast(camera->ptr); - // Yes the const_cast is ugly, but there's no other way because C++ - // doesn't have `const' constructors. Luckily const Camera's treat their - // dmnsn_camera* as a const dmnsn_camera*. - return ccamera->ray( - Canvas(const_cast(canvas)), x, y - ).dmnsn(); + return ccamera->ray(x, y).dmnsn(); } } -- cgit v1.2.3