]> git.tdb.fi Git - libs/gl.git/blobdiff - source/render/zsortedscene.h
Check the flat qualifier from the correct member
[libs/gl.git] / source / render / zsortedscene.h
index 277d62cf7ac080ed8aa70d4b132e1f4bbf636f48..a498164cd6bea37806419ed92b59d6aa5cc01ef2 100644 (file)
@@ -37,18 +37,18 @@ private:
        struct SortedRenderable
        {
                Renderable *renderable;
-               bool in_frustum;
-               float depth;
+               bool in_frustum = false;
+               float depth = 0.0f;
 
-               SortedRenderable(Renderable *);
+               SortedRenderable(Renderable *r): renderable(r) { }
 
                bool operator<(const SortedRenderable &o) const { return depth<o.depth; }
        };
 
-       std::vector<Renderable *> renderables;
+       std::vector<Renderable *> content;
        SortOrder order = BACK_TO_FRONT;
        DepthReference reference = FURTHEST;
-       mutable std::vector<SortedRenderable> sorted_cache;
+       mutable std::map<const Camera *, std::vector<SortedRenderable> > sorted_cache;
 
 public:
        virtual void add(Renderable &);
@@ -60,10 +60,6 @@ public:
        /// Sets the reference point for sorting.  Default is furthest from camera.
        void set_reference(DepthReference);
 
-private:
-       void populate_cache() const;
-
-public:
        virtual void setup_frame(Renderer &);
        virtual void finish_frame();