Fix: Null Image Data In RenderTexture::newImage Callback Error(cocos2…

…d#20776)
Diam2023 · Jul 18, 2023 · cda47ac · cda47ac
1 parent 44c14c7
commit cda47ac
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/cocos/2d/CCRenderTexture.cpp b/cocos/2d/CCRenderTexture.cpp
@@ -501,6 +501,13 @@ void RenderTexture::newImage(std::function<void(Image*)> imageCallback, bool fli
 //    } while (0);
 }
 
+void RenderTexture::createNewImage(std::function<void(Image*)> imageCallback, bool flipImage)
+{
+    _newImageCommand.init(_globalZOrder);
+    _newImageCommand.func = CC_CALLBACK_0(RenderTexture::newImage, this, imageCallback, flipImage);
+    Director::getInstance()->getRenderer()->addCommand(&_newImageCommand);
+}
+
 void RenderTexture::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
 {
     if (_autoDraw)

diff --git a/cocos/2d/CCRenderTexture.h b/cocos/2d/CCRenderTexture.h
@@ -159,6 +159,15 @@ class CC_DLL RenderTexture : public Node
      * @js NA
      */
     void newImage(std::function<void(Image*)> imageCallback, bool flipImage = true);
+
+    /**
+     * New Version Of Create a new Image from with the texture's data.
+     * FIX: Null Image Data In RenderTexture::newImage Callback Issue (#20776)
+     * 
+     * @param imageCallback 
+     * @param flipImage 
+     */
+    void createNewImage(std::function<void(Image*)> imageCallback, bool flipImage = true);
 
     /** Saves the texture into a file using JPEG format. The file will be saved in the Documents folder.
      * Returns true if the operation is successful.
@@ -390,6 +399,12 @@ class CC_DLL RenderTexture : public Node
      and the command and callback will be executed twice.
     */
     CallbackCommand _saveToFileCommand;
+
+    /**
+     * This Command Use to Fix Null Image Data In RenderTexture::newImage(#20776)
+     */
+    CallbackCommand _newImageCommand;
+
     std::function<void (RenderTexture*, const std::string&)> _saveFileCallback = nullptr;
 
     Mat4 _oldTransMatrix, _oldProjMatrix;