Merge lp:~browsernode-team/browsernode/libAVG1.8.2 into lp:browsernode

[Michel van der Breggen]

Updated BrowserNode.cpp and Browsernode.h to incorporate the new multicontext system used within libAVG 1.8.2

[Andrea (magnetto-andrea)]

review: Approve

=== modified file 'plugin/BrowserNode.cpp'
--- plugin/BrowserNode.cpp	2014-02-09 11:42:34 +0000
+++ plugin/BrowserNode.cpp	2014-09-25 06:09:12 +0000
@@ -7,11 +7,14 @@
 
 #include "../../player/Player.h"
 #include "../../player/MouseEvent.h"
-#include "../../player/SDLDisplayEngine.h"
+//#include "../../player/SDLDisplayEngine.h"
+#include "../../graphics/GLContextManager.h"
 
 #include "../../base/Logger.h"
 #include "../../graphics/OGLHelper.h"
 #include "../../wrapper/WrapHelper.h"
+#include "../../wrapper/raw_constructor.hpp"
+
 #include <berkelium/Berkelium.hpp>
 #include <berkelium/Window.hpp>
 #include <berkelium/WindowDelegate.hpp>
@@ -47,7 +50,7 @@
     m_pBerkeliumWindow = Berkelium::Window::create(context);
     m_pBerkeliumWindow->resize(0, 0);
     context->destroy();
-	preprerender();
+//	preprerender();
     Player::get()->registerPreRenderListener(this);
 }
 
@@ -58,6 +61,55 @@
     m_pBerkeliumWindow->destroy();
 }
 bool isFinishLoading = false;
+
+void BrowserNode::connectDisplay()
+{
+    RasterNode::connectDisplay();
+    createSurface();
+}
+
+void BrowserNode::connect(CanvasPtr pCanvas)
+{
+    RasterNode::connect(pCanvas);
+}
+
+void BrowserNode::disconnect(bool bKill)
+{
+    RasterNode::disconnect(bKill);
+}
+
+void BrowserNode::createSurface()
+{
+        setViewport(-32767, -32767, -32767, -32767);
+        m_bCreated = true;
+        m_LastSize = getSize();
+        if (m_XOffset < 0) {
+            m_XOffset = 0;
+        }
+        if (m_YOffset < 0) {
+            m_YOffset = 0;
+        }
+        int x = m_XOffset/100 * getWidth();
+        int y = m_YOffset/100 * getHeight();
+        IntPoint offset(x, y);
+        IntPoint size(getWidth(), getHeight());
+
+        m_pBerkeliumWindow->resize(getWidth() + offset.x, getHeight() + offset.y);
+        m_pBerkeliumWindow->setDelegate(this);
+
+        allocateBuffer(size, offset);
+        bool bMipmap = getMaterial().getUseMipmaps();
+
+        PixelFormat pf = R8G8B8A8;
+        pTexture = GLContextManager::get()->createTexture(size, pf, bMipmap); 
+        getSurface()->create(pf, pTexture);
+
+        newSurface();
+
+        // Version 1.8 of libAVG works with Bitmaps and not with memory buffers anymore. So we nee$
+        m_RenderBitmapPtr = BitmapPtr( new Bitmap( m_LastSize , pf ) );
+}
+
 void BrowserNode::onPaint(Berkelium::Window* pWindow, const unsigned char *pBitmapIn,
         const Berkelium::Rect &bitmapRect, size_t numCopyRects, 
         const Berkelium::Rect *pCopyRects, int dx, int dy,
@@ -80,37 +132,12 @@
     }
 }
 
-void BrowserNode::preprerender()
-{
-	if (!m_bCreated || getSize() != m_LastSize) {
-        m_bCreated = true;
-        m_LastSize = getSize();
-        if (m_XOffset < 0) {
-            m_XOffset = 0;
-        }
-        if (m_YOffset < 0) {
-            m_YOffset = 0;
-        }
-        int x = m_XOffset/100 * getWidth();
-        int y = m_YOffset/100 * getHeight();
-        IntPoint offset(x, y);
-        IntPoint size(getWidth(), getHeight());
-        m_pBerkeliumWindow->resize(getWidth() + offset.x, getHeight() + offset.y);
-        m_pBerkeliumWindow->setDelegate(this);
-	
-	allocateBuffer(size, offset);
-        bool bMipmap = getMaterial().getUseMipmaps();
-        GLTexturePtr pTexture = GLTexturePtr(new GLTexture(size, R8G8B8A8, bMipmap));
-        pTexture->enableStreaming();
-        getSurface()->create(R8G8B8A8,pTexture);
-        newSurface();
-    }
 
-}
 void BrowserNode::preRender(const VertexArrayPtr& pVA, bool bIsParentActive,
         float parentEffectiveOpacity)
 {
 if (!m_bCreated || getSize() != m_LastSize) {
+        setViewport(-32767, -32767, -32767, -32767);
         m_bCreated = true;
         m_LastSize = getSize();
         if (m_XOffset < 0) {
@@ -128,28 +155,37 @@
 	
 	allocateBuffer(size, offset);
         bool bMipmap = getMaterial().getUseMipmaps();
-        GLTexturePtr pTexture = GLTexturePtr(new GLTexture(size, R8G8B8A8, bMipmap));
-        pTexture->enableStreaming();
-        getSurface()->create(R8G8B8A8,pTexture);
-        newSurface();
+        
+        PixelFormat pf = R8G8B8A8;
+        pTexture = GLContextManager::get()->createTexture(size, pf, bMipmap); 
+        getSurface()->create(pf, pTexture);
+
+        // Version 1.8 of libAVG works with Bitmaps and not with memory buffers anymore. So we nee$
+        m_RenderBitmapPtr = BitmapPtr( new Bitmap( m_LastSize , pf ) );
+
     }
-	RasterNode::preRender(pVA, bIsParentActive, parentEffectiveOpacity);
+    RasterNode::preRender(pVA, bIsParentActive, parentEffectiveOpacity);
+
+    if (isVisible()) {
+       if (isDirty()){
+          m_RenderBitmapPtr->setPixels(getBuffer());
+          GLContextManager::get()->scheduleTexUpload(pTexture,  m_RenderBitmapPtr);
+          cleanDirtyFlag();
+       }
+
+       scheduleFXRender();
+    }    
+
     calcVertexArray(pVA);
 }
 
+
 static ProfilingZoneID pzid("BrowserNode::render");
 
 
 void BrowserNode::render()
 {
-ScopeTimer Timer(pzid);
-    if (isDirty()){
-        GLTexturePtr pTexture = getSurface()->getTex();
-        BitmapPtr pBmp = pTexture->lockStreamingBmp();
-        memcpy(pBmp->getPixels(), getBuffer(), getBufferLength());
-        cleanDirtyFlag();
-        pTexture->unlockStreamingBmp(true);
-    }
+    ScopeTimer Timer(pzid);
     blt32(getTransform(), getSize(), getEffectiveOpacity(), getBlendMode());
 }
 
@@ -327,6 +363,8 @@
     return m_bPainted;
 }
 
+char browserNodeName[] = "browser";
+
 void BrowserNode::registerType()
 {
         avg::TypeDefinition def = avg::TypeDefinition("browser", "rasternode",
@@ -346,6 +384,12 @@
         avg::TypeRegistry::get()->registerType(def, allowedParentNodeNames);
 }
 
+void BrowserNode::renderFX()
+{
+    RasterNode::renderFX(getSize(), Pixel32(255, 255, 255, 255), false);
+}
+
+
 }
 
 using namespace avg;
@@ -354,6 +398,7 @@
 {
     // TODO: add docstrings for all methods
     class_<BrowserNode, bases<RasterNode>, boost::noncopyable>("BrowserNode", no_init)
+        .def("__init__", raw_constructor(createNode<browserNodeName>))
         .def("loadUrl", &BrowserNode::loadUrl)
         .def("refresh", &BrowserNode::refresh)
         .def("zoom", &BrowserNode::zoom)

=== modified file 'plugin/BrowserNode.h'
--- plugin/BrowserNode.h	2014-02-08 15:51:12 +0000
+++ plugin/BrowserNode.h	2014-09-25 06:09:12 +0000
@@ -33,9 +33,15 @@
     BrowserNode(const ArgList& Args);
     virtual ~BrowserNode();
 
+    virtual void connectDisplay();
+    virtual void connect(CanvasPtr pCanvas);
+    virtual void disconnect(bool bKill);
+    void createSurface();
+
     virtual void preRender(const VertexArrayPtr& pVA, bool bIsParentActive,
             float parentEffectiveOpacity);
     virtual void render();
+    virtual void renderFX();
 
     virtual bool handleEvent(EventPtr pEvent);
     // IPreRenderListener
@@ -76,6 +82,8 @@
     float m_YOffset;
     bool m_bEventHandler;
     bool m_bPainted;
+    MCTexturePtr pTexture;
+    BitmapPtr m_RenderBitmapPtr;
 };
 
 }

=== modified file 'plugin/Makefile.am'
--- plugin/Makefile.am	2014-02-16 10:22:03 +0000
+++ plugin/Makefile.am	2014-09-25 06:09:12 +0000
@@ -1,5 +1,5 @@
 
-INCLUDES = -I. -I../player \
+AM_CPPFLAGS = -I. -I../player \
 		@XML2_CFLAGS@ @PTHREAD_CFLAGS@ @PANGOFT2_CFLAGS@ @PYTHON_CPPFLAGS@ @DC1394_2_CFLAGS@
 
 ALL_H =
@@ -9,11 +9,11 @@
     EXTRA_LDFLAGS=-read_only_relocs suppress
 else
     XGL_LIBS = -lXxf86vm
-    EXTRA_LDFLAGS=-XCClinker liblibberkelium.so -XCClinker ../../wrapper/.libs/avg.so
+    EXTRA_LDFLAGS=-XCClinker ../../wrapper/.libs/avg.so
 endif
 
 ALL_GL_LIBS = @GL_LIBS@ @SDL_LIBS@ $(XGL_LIBS)
 
 pkgpyexec_LTLIBRARIES = libbrowsernode.la
-libbrowsernode_la_SOURCES = BrowserNode.cpp BerkeliumDelegate.cpp
-libbrowsernode_la_LDFLAGS = $(EXTRA_LDFLAGS) -module -lberkeliumwrapper
+libbrowsernode_la_SOURCES = BrowserNode.cpp
+libbrowsernode_la_LDFLAGS = -lberkelium_delegate $(EXTRA_LDFLAGS) -module