-#ifndef __DALI_BLENDING_OPTIONS_H__
-#define __DALI_BLENDING_OPTIONS_H__
-
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+#ifndef DALI_BLENDING_OPTIONS_H
+#define DALI_BLENDING_OPTIONS_H
+
+/*
+ * Copyright (c) 2017 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
// INTERNAL INCLUDES
-#include <dali/public-api/actors/blending.h>
+#include <dali/public-api/rendering/renderer.h>
#include <dali/public-api/math/vector4.h>
+#include <dali/internal/common/owner-pointer.h>
namespace Dali
{
/**
* @copydoc Dali::RenderableActor::SetBlendFunc()
*/
- void SetBlendFunc( BlendingFactor::Type srcFactorRgb, BlendingFactor::Type destFactorRgb,
- BlendingFactor::Type srcFactorAlpha, BlendingFactor::Type destFactorAlpha );
+ void SetBlendFunc( BlendFactor::Type srcFactorRgb, BlendFactor::Type destFactorRgb,
+ BlendFactor::Type srcFactorAlpha, BlendFactor::Type destFactorAlpha );
/**
* @copydoc Dali::RenderableActor::GetBlendFunc()
*/
- BlendingFactor::Type GetBlendSrcFactorRgb() const;
+ BlendFactor::Type GetBlendSrcFactorRgb() const;
/**
* @copydoc Dali::RenderableActor::GetBlendFunc()
*/
- BlendingFactor::Type GetBlendDestFactorRgb() const;
+ BlendFactor::Type GetBlendDestFactorRgb() const;
/**
* @copydoc Dali::RenderableActor::GetBlendFunc()
*/
- BlendingFactor::Type GetBlendSrcFactorAlpha() const;
+ BlendFactor::Type GetBlendSrcFactorAlpha() const;
/**
* @copydoc Dali::RenderableActor::GetBlendFunc()
*/
- BlendingFactor::Type GetBlendDestFactorAlpha() const;
+ BlendFactor::Type GetBlendDestFactorAlpha() const;
/**
* @copydoc Dali::RenderableActor::SetBlendEquation()
*/
- void SetBlendEquation( BlendingEquation::Type equationRgb, BlendingEquation::Type equationAlpha );
+ void SetBlendEquation( BlendEquation::Type equationRgb, BlendEquation::Type equationAlpha );
/**
* @copydoc Dali::RenderableActor::GetBlendEquation()
*/
- BlendingEquation::Type GetBlendEquationRgb() const;
+ BlendEquation::Type GetBlendEquationRgb() const;
/**
* @copydoc Dali::RenderableActor::GetBlendEquation()
*/
- BlendingEquation::Type GetBlendEquationAlpha() const;
+ BlendEquation::Type GetBlendEquationAlpha() const;
/**
* Set the blend color.
* @param[in] color The blend color.
* @return True if the blend color changed, otherwise it was already the same color.
*/
- bool SetBlendColor( const Vector4& color );
+ void SetBlendColor( const Vector4& color );
/**
* Query the blend color.
unsigned int mBitmask; ///< A bitmask of blending options
- Vector4* mOptionalColor; ///< A heap-allocated color (owned)
+ OwnerPointer< Vector4> mBlendColor; ///< A heap-allocated color (owned)
+
};
} // namespace Internal
} // namespace Dali
-#endif // __DALI_BLENDING_OPTIONS_H__
+#endif // DALI_BLENDING_OPTIONS_H