Changeset 3997

Timestamp:

07/13/12 16:26:15 (10 months ago)

Author:

vdaras

Message:

Made LibRocketRenderInterface? store calls from Rocket for geometry that needs to be rendererd. [t:723]

Location:

branches/active/gui_enhancements/engine/core/gui/librocket

Files:

• librocketrenderinterface.cpp (modified) (3 diffs)
• librocketrenderinterface.h (modified) (4 diffs)

branches/active/gui_enhancements/engine/core/gui/librocket/librocketrenderinterface.cpp

@@ -42 +42 @@
         
         LibRocketRenderInterface::~LibRocketRenderInterface() {
+                freeTextures();
         }
         
         void LibRocketRenderInterface::RenderGeometry(Rocket::Core::Vertex* vertices, int num_vertices, int* indices, int num_indices, Rocket::Core::TextureHandle texture, const Rocket::Core::Vector2f& translation) {
+                GeometryCallData geometryCallData;
+                
+                for(int i = 0; i < num_vertices; i++) {
+                        geometryCallData.vertices.push_back(vertices[i]);
+                }
+                
+                for(int i = 0; i < num_indices; i++) {
+                        geometryCallData.indices.push_back(indices[i]);
+                }
+                
+                geometryCallData.textureHandle = texture;
+                geometryCallData.translation = translation;
+                
+                if(m_geometryCalls.empty()) {
+                        GeometryCall geometryCall;
+                        geometryCall.callChain.push(geometryCallData);
+                        
+                        m_geometryCalls.push(geometryCall);
+                } else {
+                        GeometryCall& geometryCall = m_geometryCalls.front();
+                        geometryCall.callChain.push(geometryCallData);
+                }
         }
         
@@ -65 +88 @@
         
         void LibRocketRenderInterface::SetScissorRegion(int x, int y, int width, int height) {
+                GeometryCall gc;
+                
+                gc.hasScissorArea = true;
+                gc.scissorArea = Rect(x, y, width, height);
+                m_geometryCalls.push(gc);
         }
         
@@ -96 +124 @@
         void LibRocketRenderInterface::ReleaseTexture(Rocket::Core::TextureHandle texture_handle) {
                 
-                ResourceHandle handle = static_cast<ResourceHandle>(texture_handle);
-                ImagePtr texture = m_imageManager->get(handle);
-                texture->free();
+                ResourceHandle rh = static_cast<ResourceHandle>(texture_handle);
+                m_freedTextures.push_back(rh);
+        }
+        
+        void LibRocketRenderInterface::freeTextures() {
+                std::list<ResourceHandle>::iterator it(m_freedTextures.begin());
+                std::list<ResourceHandle>::iterator end(m_freedTextures.end());
+                
+                for(; it != end; ++it) {
+                        ResourceHandle rh = (*it);
+                        ImagePtr texture = m_imageManager->get(rh);
+                        texture->free();
+                }
+                
+                m_freedTextures.clear();
         }
 };

branches/active/gui_enhancements/engine/core/gui/librocket/librocketrenderinterface.h

@@ -24 +24 @@
 
 // Standard C++ library includes
+#include <list>
 #include <queue>
 #include <vector>
@@ -35 +36 @@
 // Second block: files included from the same folder
 #include "util/base/singleton.h"
+#include "util/resource/resource.h"
 
 namespace FIFE {
@@ -87 +89 @@
                 virtual void ReleaseTexture(Rocket::Core::TextureHandle texture_handle);
                 
+                /**
+                 * Frees all textures that are no longer needed by librocket.
+                 */
+                void freeTextures();
+                
         private:
                 
@@ -105 +112 @@
                 class GeometryCall {
                 public:
+                        
+                        GeometryCall() : hasScissorArea(false) { }
+                        
                         GeometryCallDataChain callChain;
                         Rect scissorArea;
+                        bool hasScissorArea;
                 };
                 
                 std::queue<GeometryCall> m_geometryCalls;
+                
+                std::list<ResourceHandle> m_freedTextures;
         };