/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/actors/actor-enumerations.h>
#include <dali/public-api/actors/draw-mode.h>
-#include <dali/public-api/actors/image-actor.h>
-#include <dali/public-api/actors/blending.h>
#include <dali/public-api/actors/camera-actor.h>
#include <dali/public-api/actors/sampling.h>
#include <dali/public-api/render-tasks/render-task.h>
#include <dali/public-api/common/loading-state.h>
-#include <dali/devel-api/rendering/renderer.h>
-#include <dali/devel-api/rendering/geometry.h>
+#include <dali/public-api/rendering/geometry.h>
+#include <dali/public-api/rendering/renderer.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
{ "COLOR_MODE_USE_OWN_MULTIPLY_PARENT_ALPHA", USE_OWN_MULTIPLY_PARENT_ALPHA },
- { "POSITION_INHERITANCE_INHERIT_PARENT_POSITION", INHERIT_PARENT_POSITION },
- { "POSITION_INHERITANCE_USE_PARENT_POSITION", USE_PARENT_POSITION },
- { "POSITION_INHERITANCE_USE_PARENT_POSITION_PLUS_LOCAL_POSITION", USE_PARENT_POSITION_PLUS_LOCAL_POSITION },
- { "POSITION_INHERITANCE_DONT_INHERIT_POSITION", DONT_INHERIT_POSITION },
-
{ "DRAW_MODE_NORMAL", DrawMode::NORMAL },
{ "DRAW_MODE_OVERLAY_2D", DrawMode::OVERLAY_2D },
- { "DRAW_MODE_STENCIL", DrawMode::STENCIL },
{ "RESOURCE_LOADING", Dali::ResourceLoading },
{ "RESOURCE_LOADING_SUCCEEDED", Dali::ResourceLoadingSucceeded },
{ "SAMPLING_MODE_NO_FILTER", SamplingMode::NO_FILTER },
{ "SAMPLING_MODE_DONT_CARE", SamplingMode::DONT_CARE },
- { "BLEND_FACTOR_ZERO", BlendingFactor::ZERO },
- { "BLEND_FACTOR_ONE", BlendingFactor::ONE },
- { "BLEND_FACTOR_SRC_COLOR", BlendingFactor::SRC_COLOR },
- { "BLEND_FACTOR_ONE_MINUS_SRC_COLOR", BlendingFactor::ONE_MINUS_SRC_COLOR },
- { "BLEND_FACTOR_SRC_ALPHA", BlendingFactor::SRC_ALPHA },
- { "BLEND_FACTOR_ONE_MINUS_SRC_ALPHA", BlendingFactor::ONE_MINUS_SRC_ALPHA },
- { "BLEND_FACTOR_DST_ALPHA", BlendingFactor::DST_ALPHA },
- { "BLEND_FACTOR_ONE_MINUS_DST_ALPHA", BlendingFactor::ONE_MINUS_DST_ALPHA },
- { "BLEND_FACTOR_DST_COLOR", BlendingFactor::DST_COLOR },
- { "BLEND_FACTOR_ONE_MINUS_DST_COLOR", BlendingFactor::ONE_MINUS_DST_COLOR },
- { "BLEND_FACTOR_SRC_ALPHA_SATURATE", BlendingFactor::SRC_ALPHA_SATURATE },
- { "BLEND_FACTOR_CONSTANT_COLOR", BlendingFactor::CONSTANT_COLOR },
- { "BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR", BlendingFactor::ONE_MINUS_CONSTANT_COLOR },
- { "BLEND_FACTOR_CONSTANT_ALPHA" , BlendingFactor::CONSTANT_ALPHA },
- { "BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA", BlendingFactor::ONE_MINUS_CONSTANT_ALPHA },
-
- { "BLENDING_OFF", BlendingMode::OFF },
- { "BLENDING_AUTO", BlendingMode::AUTO },
- { "BLENDING_ON", BlendingMode::ON },
-
- { "BLEND_EQUATION_ADD", BlendingEquation::ADD },
- { "BLEND_EQUATION_SUBTRACT", BlendingEquation::SUBTRACT },
- { "BLEND_EQUATION_REVERSE_SUBTRACT", BlendingEquation::REVERSE_SUBTRACT },
+ { "BLEND_FACTOR_ZERO", BlendFactor::ZERO },
+ { "BLEND_FACTOR_ONE", BlendFactor::ONE },
+ { "BLEND_FACTOR_SRC_COLOR", BlendFactor::SRC_COLOR },
+ { "BLEND_FACTOR_ONE_MINUS_SRC_COLOR", BlendFactor::ONE_MINUS_SRC_COLOR },
+ { "BLEND_FACTOR_SRC_ALPHA", BlendFactor::SRC_ALPHA },
+ { "BLEND_FACTOR_ONE_MINUS_SRC_ALPHA", BlendFactor::ONE_MINUS_SRC_ALPHA },
+ { "BLEND_FACTOR_DST_ALPHA", BlendFactor::DST_ALPHA },
+ { "BLEND_FACTOR_ONE_MINUS_DST_ALPHA", BlendFactor::ONE_MINUS_DST_ALPHA },
+ { "BLEND_FACTOR_DST_COLOR", BlendFactor::DST_COLOR },
+ { "BLEND_FACTOR_ONE_MINUS_DST_COLOR", BlendFactor::ONE_MINUS_DST_COLOR },
+ { "BLEND_FACTOR_SRC_ALPHA_SATURATE", BlendFactor::SRC_ALPHA_SATURATE },
+ { "BLEND_FACTOR_CONSTANT_COLOR", BlendFactor::CONSTANT_COLOR },
+ { "BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR", BlendFactor::ONE_MINUS_CONSTANT_COLOR },
+ { "BLEND_FACTOR_CONSTANT_ALPHA" , BlendFactor::CONSTANT_ALPHA },
+ { "BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA", BlendFactor::ONE_MINUS_CONSTANT_ALPHA },
+
+ { "BLEND_MODE_OFF", BlendMode::OFF },
+ { "BLEND_MODE_AUTO", BlendMode::AUTO },
+ { "BLEND_MODE_ON", BlendMode::ON },
+
+ { "BLEND_EQUATION_ADD", BlendEquation::ADD },
+ { "BLEND_EQUATION_SUBTRACT", BlendEquation::SUBTRACT },
+ { "BLEND_EQUATION_REVERSE_SUBTRACT", BlendEquation::REVERSE_SUBTRACT },
{ "CAMERA_FREE_LOOK" , Camera::FREE_LOOK },
{ "CAMERA_LOOK_AT_TARGET" , Camera::LOOK_AT_TARGET },
{ "WRAP_MODE_REPEAT", WrapMode::REPEAT },
{ "WRAP_MODE_MIRRORED_REPEAT", WrapMode::MIRRORED_REPEAT },
- { "RENDERER_CULL_NONE", Renderer::CULL_NONE },
- { "RENDERER_CULL_BACK", Renderer::CULL_BACK },
- { "RENDERER_CULL_FRONT", Renderer::CULL_FRONT },
- { "RENDERER_CULL_BACK_AND_FRONT", Renderer::CULL_BACK_AND_FRONT },
+ { "FACE_CULLING_NONE", FaceCullingMode::NONE },
+ { "FACE_CULLING_BACK", FaceCullingMode::BACK },
+ { "FACE_CULLING_FRONT", FaceCullingMode::FRONT },
+ { "FACE_CULLING_FRONT_AND_BACK", FaceCullingMode::FRONT_AND_BACK },
- { "RENDERER_DEPTH_WRITE_OFF", Renderer::DEPTH_WRITE_OFF },
- { "RENDERER_DEPTH_WRITE_AUTO", Renderer::DEPTH_WRITE_AUTO },
- { "RENDERER_DEPTH_WRITE_ON", Renderer::DEPTH_WRITE_ON },
+ { "DEPTH_WRITE_OFF", DepthWriteMode::OFF },
+ { "DEPTH_WRITE_AUTO", DepthWriteMode::AUTO },
+ { "DEPTH_WRITE_ON", DepthWriteMode::ON },
{ "GEOMETRY_POINTS", Geometry::POINTS },
{ "GEOMETRY_LINES", Geometry::LINES },
{ "ALPHA_FUNCTION_SIN", AlphaFunction::SIN },
{ "ALPHA_FUNCTION_EASE_OUT_BACK", AlphaFunction::EASE_OUT_BACK },
+ { "CLIPPING_MODE_DISABLED", ClippingMode::DISABLED },
+ { "CLIPPING_MODE_CLIP_CHILDREN", ClippingMode::CLIP_CHILDREN },
};
const unsigned int EnumTableCount = sizeof(EnumTable)/sizeof(EnumTable[0]);
-
-
-
-
-
} // un-named name space
projects / platform / core / uifw / dali-toolkit.git / blobdiff