Setup viewport and blendmode with calling renderDirect

haxenme · Oct 3, 2024 · ab442e2 · ab442e2
1 parent c6fdc07
commit ab442e2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/project/include/Hardware.h b/project/include/Hardware.h
@@ -169,7 +169,7 @@ class HardwareRenderer : public HardwareContext
    virtual void Render(const RenderState &inState, const HardwareData &inData );
    virtual void RenderData(const HardwareData &inData, const ColorTransform *ctrans,const Trans4x4 &inTrans)=0;
 
-   virtual void BeginDirectRender()=0;
+   virtual void BeginDirectRender(const Rect &inRect)=0;
    virtual void EndDirectRender()=0;
 
 

diff --git a/project/src/common/Display.cpp b/project/src/common/Display.cpp
@@ -904,10 +904,12 @@ void DirectRenderer::Render( const RenderTarget &inTarget, const RenderState &in
 {
    if (inState.mPhase==rpRender && inTarget.IsHardware())
    {
+      RenderState state(inState);
+
       gDirectRenderContext = inTarget.mHardware;
-      gDirectRenderContext->BeginDirectRender();
       Rect clip = inState.mClipRect;
       clip.y = inTarget.mHardware->Height() - clip.y - clip.h;
+      gDirectRenderContext->BeginDirectRender(clip);
       if (gNmeRenderGcFree)
       {
          gc_exit_blocking();

diff --git a/project/src/metal/MetalContext.mm b/project/src/metal/MetalContext.mm
@@ -967,7 +967,7 @@ void RenderData(const HardwareData &inData, const ColorTransform *ctrans,const T
       }
    }
 
-   void BeginDirectRender() { }
+   void BeginDirectRender(const Rect &inRect) { }
    void EndDirectRender() { }
 };
 

diff --git a/project/src/opengl/OpenGLContext.cpp b/project/src/opengl/OpenGLContext.cpp
@@ -478,8 +478,23 @@ class OGLContext : public HardwareRenderer
       #endif
    }
 
-   void BeginDirectRender()
+   void BeginDirectRender(const Rect &inRect)
    {
+      makeCurrent();
+
+      SetViewport(inRect);
+
+      glEnable(GL_BLEND);
+      glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
+
+
+      #ifdef WEBOS
+      glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
+      #endif
+
+      mLineWidth = 99999;
+
+
       gDirectMaxAttribArray = 0;
       #ifndef NME_NO_GETERROR
       int err0 = glGetError();
@@ -493,6 +508,9 @@ class OGLContext : public HardwareRenderer
       for(int i=0;i<gDirectMaxAttribArray;i++)
          glDisableVertexAttribArray(i);
 
+      // Force dirty
+      mViewport.w = -1;
+
       #ifndef NME_NO_GETERROR
       int err = glGetError();
       if (err != GL_NO_ERROR)

diff --git a/src/nme/display/DirectRenderer.hx b/src/nme/display/DirectRenderer.hx
@@ -18,7 +18,8 @@ class DirectRenderer extends DisplayObject
 
    private function nmeOnRender(inRect:Dynamic) 
    {
-      if (render != null) render(new Rectangle(inRect.x, inRect.y, inRect.width, inRect.height));
+      if (render != null)
+         render(new Rectangle(inRect.x, inRect.y, inRect.width, inRect.height));
    }
 
    public dynamic function render(inRect:Rectangle)