projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "refactor AlphaFunction class to reduce size" into devel/master
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
rendering
/
renderer-impl.h
diff --git
a/dali/internal/event/rendering/renderer-impl.h
b/dali/internal/event/rendering/renderer-impl.h
index
3a36186
..
6849bf3
100755
(executable)
--- a/
dali/internal/event/rendering/renderer-impl.h
+++ b/
dali/internal/event/rendering/renderer-impl.h
@@
-2,7
+2,7
@@
#define DALI_INTERNAL_RENDERER_H
/*
#define DALI_INTERNAL_RENDERER_H
/*
- * Copyright (c) 20
18
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-40,7
+40,7
@@
class Renderer;
}
class Renderer;
}
class Renderer;
-
typedef IntrusivePtr<Renderer> RendererPtr
;
+
using RendererPtr = IntrusivePtr<Renderer>
;
/**
* Renderer is an object that can be used to show content by combining a Geometry with a shader and textures.
/**
* Renderer is an object that can be used to show content by combining a Geometry with a shader and textures.
@@
-123,19
+123,19
@@
public:
BlendFactor::Type& srcFactorAlpha, BlendFactor::Type& destFactorAlpha ) const;
/**
BlendFactor::Type& srcFactorAlpha, BlendFactor::Type& destFactorAlpha ) const;
/**
- * @
copydoc Dali::Renderer::SetBlendEquation()
+ * @
brief Set same Blend Equation for the RGB and alpha
*/
*/
- void SetBlendEquation( BlendEquation::Type equationRgba );
+ void SetBlendEquation(
Devel
BlendEquation::Type equationRgba );
/**
/**
- * @
copydoc Dali::Renderer::SetBlendEquation()
+ * @
brief Set Blend Equation separately for the RGB and alpha
*/
*/
- void SetBlendEquation(
BlendEquation::Type equationRgb,
BlendEquation::Type equationAlpha );
+ void SetBlendEquation(
DevelBlendEquation::Type equationRgb, Devel
BlendEquation::Type equationAlpha );
/**
/**
- * @
copydoc Dali::Renderer::GetBlendEquation()
+ * @
brief Get Blend Equation of rgb and alpha
*/
*/
- void GetBlendEquation(
BlendEquation::Type& equationRgb,
BlendEquation::Type& equationAlpha ) const;
+ void GetBlendEquation(
DevelBlendEquation::Type& equationRgb, Devel
BlendEquation::Type& equationAlpha ) const;
/**
* @copydoc Dali::Renderer::SetIndexedDrawFirstElement
/**
* @copydoc Dali::Renderer::SetIndexedDrawFirstElement
@@
-162,6
+162,13
@@
public:
bool IsPreMultipliedAlphaEnabled() const;
/**
bool IsPreMultipliedAlphaEnabled() const;
/**
+ * @brief Query whether Blend Equation Advanced is used in this renderer
+ *
+ * @return True is Blend Equation Advanced is used, false otherwise.
+ */
+ bool IsAdvancedBlendEquationApplied() const;
+
+ /**
* @brief Get the scene graph object
*
* @return the scene object
* @brief Get the scene graph object
*
* @return the scene object
@@
-173,32
+180,32
@@
public: // Default property extensions from Object
/**
* @copydoc Dali::Internal::Object::SetDefaultProperty()
*/
/**
* @copydoc Dali::Internal::Object::SetDefaultProperty()
*/
- v
irtual void SetDefaultProperty(Property::Index index, const Property::Value& propertyValue)
;
+ v
oid SetDefaultProperty(Property::Index index, const Property::Value& propertyValue) override
;
/**
* @copydoc Dali::Internal::Object::GetDefaultProperty()
*/
/**
* @copydoc Dali::Internal::Object::GetDefaultProperty()
*/
-
virtual Property::Value GetDefaultProperty( Property::Index index ) const
;
+
Property::Value GetDefaultProperty( Property::Index index ) const override
;
/**
* @copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
*/
/**
* @copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
*/
-
virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const
;
+
Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const override
;
/**
* @copydoc Dali::Internal::Object::OnNotifyDefaultPropertyAnimation()
*/
/**
* @copydoc Dali::Internal::Object::OnNotifyDefaultPropertyAnimation()
*/
- v
irtual void OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType )
;
+ v
oid OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value, Animation::Type animationType ) override
;
/**
* @copydoc Dali::Internal::Object::GetSceneObjectAnimatableProperty()
*/
/**
* @copydoc Dali::Internal::Object::GetSceneObjectAnimatableProperty()
*/
-
virtual const SceneGraph::PropertyBase* GetSceneObjectAnimatableProperty( Property::Index index ) const
;
+
const SceneGraph::PropertyBase* GetSceneObjectAnimatableProperty( Property::Index index ) const override
;
/**
* @copydoc Dali::Internal::Object::GetSceneObjectInputProperty()
*/
/**
* @copydoc Dali::Internal::Object::GetSceneObjectInputProperty()
*/
-
virtual const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const
;
+
const PropertyInputImpl* GetSceneObjectInputProperty( Property::Index index ) const override
;
/**
* @brief Adds a draw command to the Renderer.
/**
* @brief Adds a draw command to the Renderer.
@@
-249,7
+256,7
@@
protected:
/**
* A reference counted object may only be deleted by calling Unreference()
*/
/**
* A reference counted object may only be deleted by calling Unreference()
*/
-
virtual ~Renderer()
;
+
~Renderer() override
;
private: // unimplemented methods
Renderer( const Renderer& );
private: // unimplemented methods
Renderer( const Renderer& );