From ac1cb9a8ad3236bd14eb644e01c1489eb8723477 Mon Sep 17 00:00:00 2001 From: Mats Honkamaa Date: Thu, 17 Oct 2019 09:27:56 +0300 Subject: Add BufferCapture QML documentation Copied the very basic C++ docs. Task-number: QTBUG-79109 Change-Id: Ib5803dfc06d7d10001e31f9cb0c113509cc23f0f Reviewed-by: Paul Lemire --- src/render/framegraph/qbuffercapture.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/render/framegraph/qbuffercapture.cpp b/src/render/framegraph/qbuffercapture.cpp index d1d301077..8e180a7c3 100644 --- a/src/render/framegraph/qbuffercapture.cpp +++ b/src/render/framegraph/qbuffercapture.cpp @@ -63,6 +63,14 @@ QBufferCapturePrivate::QBufferCapturePrivate() \inmodule Qt3DRender \brief Exchanges buffer data between GPU and CPU. */ + +/*! + \qmltype BufferCapture + \inqmlmodule Qt3D.Render + \instantiates Qt3DRender::QBufferCapture + \brief Exchanges buffer data between GPU and CPU. +*/ + QBufferCapture::QBufferCapture(Qt3DCore::QNode *parent) : QFrameGraphNode(*new QBufferCapturePrivate, parent) { -- cgit v1.2.3 From 2e8842d1c7cea00a9798930f3d5aacc26293b726 Mon Sep 17 00:00:00 2001 From: Mats Honkamaa Date: Wed, 9 Oct 2019 14:39:05 +0300 Subject: Add documentation for PhongAlphaMaterial properties Added documentation for the following PhongAlphaMaterial QML Type properties: blendFunctionArg, destinationAlphaArg, destinationRgbArg, sourceAlphaArg, and sourceRgbArg. Task-number: QTBUG-78480 Change-Id: I392480926f8803e82ad88ee9638130c6f9b74931 Reviewed-by: Paul Lemire --- src/doc/src/qmlextramaterials.qdoc | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/doc/src/qmlextramaterials.qdoc b/src/doc/src/qmlextramaterials.qdoc index e0a2e9edf..338bada09 100644 --- a/src/doc/src/qmlextramaterials.qdoc +++ b/src/doc/src/qmlextramaterials.qdoc @@ -544,6 +544,41 @@ The default value is 0.5. */ +/*! + \qmlproperty BlendEquationArguments::Blending PhongAlphaMaterial::sourceRgbArg + + Holds the blend equation source RGB blending argument. + + \sa Qt3DRender::QBlendEquationArguments::Blending +*/ +/*! + \qmlproperty BlendEquationArguments::Blending PhongAlphaMaterial::destinationRgbArg + + Holds the blend equation destination RGB blending argument. + + \sa Qt3DRender::QBlendEquationArguments::Blending +*/ +/*! + \qmlproperty BlendEquationArguments::Blending PhongAlphaMaterial::sourceAlphaArg + + Holds the blend equation source alpha blending argument. + + \sa Qt3DRender::QBlendEquationArguments::Blending +*/ +/*! + \qmlproperty BlendEquationArguments::Blending PhongAlphaMaterial::destinationAlphaArg + + Holds the blend equation destination alpha blending argument. + + \sa Qt3DRender::QBlendEquationArguments::Blending +*/ +/*! + \qmlproperty BlendEquation::BlendFunction PhongAlphaMaterial::blendFunctionArg + + Holds the blend equation function argument. + + \sa Qt3DRender::QBlendEquation::BlendFunction +*/ /*! \qmltype PhongMaterial -- cgit v1.2.3