X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Fview.h;h=3b0d625df7456c74178becd3eb9476e01718ffb3;hb=54ab7c88976c860ea729e30a175fbc181f0d68cd;hp=f18f0a1f6a8bc95201f5dd9fbbcef339b09cc4ce;hpb=495c54e187ddbb7514c983e1829a69d82ccad5f3;p=r2c2.git diff --git a/source/3d/view.h b/source/3d/view.h index f18f0a1..3b0d625 100644 --- a/source/3d/view.h +++ b/source/3d/view.h @@ -1,15 +1,9 @@ -/* $Id$ - -This file is part of R²C² -Copyright © 2011 Mikkosoft Productions, Mikko Rasa -Distributed under the GPL -*/ - #ifndef R2C2_3D_VIEW_H_ #define R2C2_3D_VIEW_H_ #include #include +#include "sky.h" namespace R2C2 { @@ -19,8 +13,11 @@ class View3D { protected: Layout3D &layout; + unsigned width; + unsigned height; Msp::GL::Camera camera; Msp::GL::Pipeline pipeline; + Sky3D sky; public: View3D(Layout3D &, unsigned, unsigned); @@ -29,6 +26,9 @@ public: Msp::GL::Camera &get_camera() { return camera; } Msp::GL::Pipeline &get_pipeline() { return pipeline; } + Ray create_ray(int, int) const; + Ray create_ray(float, float) const; + void view_all(bool = false); void render();