X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fdali-script-v8%2Fsrc%2Fconstants%2Fconstants-wrapper.cpp;h=15252da6e4795db01379ae62bbaffc20c25dd6eb;hb=d00a250741411c386d988e7ac34525cf94a1918e;hp=a3a3dd789932b086bbb7d761bc8911c323b3b86a;hpb=e453077b0b829b7377f0d2e8fd23c887ce876ae2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/plugins/dali-script-v8/src/constants/constants-wrapper.cpp b/plugins/dali-script-v8/src/constants/constants-wrapper.cpp
index a3a3dd7..15252da 100644
--- a/plugins/dali-script-v8/src/constants/constants-wrapper.cpp
+++ b/plugins/dali-script-v8/src/constants/constants-wrapper.cpp
@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -33,8 +33,8 @@
 #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/material.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>
 
@@ -178,29 +178,29 @@ const IntegerPair EnumTable[] =
     { "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              },
@@ -217,10 +217,14 @@ const IntegerPair EnumTable[] =
     { "WRAP_MODE_REPEAT",                     WrapMode::REPEAT           },
     { "WRAP_MODE_MIRRORED_REPEAT",            WrapMode::MIRRORED_REPEAT  },
 
-    { "MATERIAL_NONE",                        Material::NONE                      },
-    { "MATERIAL_CULL_BACK",                   Material::CULL_BACK                 },
-    { "MATERIAL_CULL_FRONT",                  Material::CULL_FRONT                },
-    { "MATERIAL_CULL_BACK_AND_FRONT",         Material::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 },
+
+    { "DEPTH_WRITE_OFF",                      DepthWriteMode::OFF   },
+    { "DEPTH_WRITE_AUTO",                     DepthWriteMode::AUTO  },
+    { "DEPTH_WRITE_ON",                       DepthWriteMode::ON    },
 
     { "GEOMETRY_POINTS",                      Geometry::POINTS          },
     { "GEOMETRY_LINES",                       Geometry::LINES           },