fixed layer bugs; generalized octree

[chaz/yoink] / src / Moof / Video.hh

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index bb1fdd48db9b168a086be687c6cc2f51fe55a284..5f56f9e1d33e103ac0bf912b7f6584d0e45b516d 100644 (file)
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -35,13 +35,18 @@
 
 #include <SDL/SDL.h>
 
+#include <Moof/Exception.hh>
+
 
 namespace Mf {
 
 
-class Video
+class Video;
+typedef boost::shared_ptr<Video> VideoP;
+
+
+struct Video
 {
-public:
        struct Attributes
        {
                // OpenGL attributes
@@ -69,6 +74,27 @@ public:
                Attributes();
        };
 
+
+private:
+
+       void init(const Attributes& attribs);
+
+       void recreateContext();
+       void setOpenGLAttributes();
+
+       void setIcon();
+
+       SDL_Surface* context_;
+       unsigned flags_;
+       Attributes attribs_;
+
+public:
+
+       static VideoP alloc(const std::string& caption, const std::string& icon)
+       {
+               return VideoP(new Video(caption, icon));
+       }
+
        Video();
        explicit Video(const Attributes& attribs);
        explicit Video(const std::string& caption, const std::string& icon);
@@ -102,28 +128,22 @@ public:
        void makeActive();
        void swap();
 
+       int getWidth() const;
+       int getHeight() const;
 
-       struct Exception : public std::runtime_error
-       {
-               explicit Exception(const std::string& what_arg) :
-                       std::runtime_error(what_arg) {}
-       };
-
-private:
-       void init(const Attributes& attribs);
-
-       void recreateContext();
-       void setOpenGLAttributes();
 
-       void setIcon();
+       struct Exception : public Mf::Exception
+       {
+               explicit Exception(unsigned error) :
+                       Mf::Exception(error) {}
 
-       SDL_Surface* context_;
-       unsigned flags_;
-       Attributes attribs_;
+               void raise()
+               {
+                       throw *this;
+               }
+       };
 };
 
-typedef boost::shared_ptr<Video> VideoPtr;
-
 
 } // namespace Mf