From: Tom Robinson Date: Fri, 6 Mar 2015 17:55:32 +0000 (+0000) Subject: dali-core property type comment to represent type instead of property enum X-Git-Tag: accepted/tizen/common/20150310.094801^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F36469%2F2;p=platform%2Fcore%2Fuifw%2Fdali-core.git dali-core property type comment to represent type instead of property enum Change-Id: I3e3ef12b11b6984567c4ec1c54de6e54054ce8f0 --- diff --git a/dali/internal/event/animation/active-constraint-base.cpp b/dali/internal/event/animation/active-constraint-base.cpp index 63ddb60..a0506d7 100644 --- a/dali/internal/event/animation/active-constraint-base.cpp +++ b/dali/internal/event/animation/active-constraint-base.cpp @@ -45,7 +45,7 @@ namespace // unnamed namespace // Name Type writable animatable constraint-input enum for index-checking DALI_PROPERTY_TABLE_BEGIN DALI_PROPERTY( "weight", FLOAT, true, true, true, Dali::ActiveConstraint::Property::WEIGHT ) -DALI_PROPERTY_TABLE_END( DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX ) +DALI_PROPERTY_TABLE_END( DEFAULT_OBJECT_PROPERTY_START_INDEX ) // Signals diff --git a/dali/internal/event/animation/path-impl.cpp b/dali/internal/event/animation/path-impl.cpp index 84f2748..44d422b 100644 --- a/dali/internal/event/animation/path-impl.cpp +++ b/dali/internal/event/animation/path-impl.cpp @@ -34,7 +34,7 @@ namespace DALI_PROPERTY_TABLE_BEGIN DALI_PROPERTY( "points", ARRAY, true, false, false, Dali::Path::Property::POINTS ) DALI_PROPERTY( "control-points", ARRAY, true, false, false, Dali::Path::Property::CONTROL_POINTS ) -DALI_PROPERTY_TABLE_END( DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX ) +DALI_PROPERTY_TABLE_END( DEFAULT_OBJECT_PROPERTY_START_INDEX ) /** * These coefficient arise from the cubic polynomial equations for diff --git a/dali/internal/event/modeling/animatable-mesh-impl.cpp b/dali/internal/event/modeling/animatable-mesh-impl.cpp index f97f884..a187a45 100644 --- a/dali/internal/event/modeling/animatable-mesh-impl.cpp +++ b/dali/internal/event/modeling/animatable-mesh-impl.cpp @@ -43,7 +43,7 @@ DALI_PROPERTY_TABLE_BEGIN DALI_PROPERTY( "position", VECTOR3, true, true, true, Dali::AnimatableVertex::Property::POSITION ) DALI_PROPERTY( "vertex-color", VECTOR4, true, true, true, Dali::AnimatableVertex::Property::COLOR ) DALI_PROPERTY( "texture-coords", VECTOR2, true, true, true, Dali::AnimatableVertex::Property::TEXTURE_COORDS ) -DALI_PROPERTY_TABLE_END( DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX ) +DALI_PROPERTY_TABLE_END( DEFAULT_OBJECT_PROPERTY_START_INDEX ) } // namespace diff --git a/dali/internal/event/render-tasks/render-task-impl.cpp b/dali/internal/event/render-tasks/render-task-impl.cpp index bc8d2a9..50fed2d 100644 --- a/dali/internal/event/render-tasks/render-task-impl.cpp +++ b/dali/internal/event/render-tasks/render-task-impl.cpp @@ -54,7 +54,7 @@ DALI_PROPERTY_TABLE_BEGIN DALI_PROPERTY( "viewport-position", VECTOR2, true, true, true, Dali::RenderTask::Property::VIEWPORT_POSITION ) DALI_PROPERTY( "viewport-size", VECTOR2, true, true, true, Dali::RenderTask::Property::VIEWPORT_SIZE ) DALI_PROPERTY( "clear-color", VECTOR4, true, true, true, Dali::RenderTask::Property::CLEAR_COLOR ) -DALI_PROPERTY_TABLE_END( DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX ) +DALI_PROPERTY_TABLE_END( DEFAULT_OBJECT_PROPERTY_START_INDEX ) // Signals diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h index c5d0b0b..5d3163f 100644 --- a/dali/public-api/actors/actor.h +++ b/dali/public-api/actors/actor.h @@ -254,51 +254,51 @@ public: { enum { - PARENT_ORIGIN = DEFAULT_ACTOR_PROPERTY_START_INDEX, ///< name "parent-origin", type VECTOR3 - PARENT_ORIGIN_X, ///< name "parent-origin-x", type FLOAT - PARENT_ORIGIN_Y, ///< name "parent-origin-y", type FLOAT - PARENT_ORIGIN_Z, ///< name "parent-origin-z", type FLOAT - ANCHOR_POINT, ///< name "anchor-point", type VECTOR3 - ANCHOR_POINT_X, ///< name "anchor-point-x", type FLOAT - ANCHOR_POINT_Y, ///< name "anchor-point-y", type FLOAT - ANCHOR_POINT_Z, ///< name "anchor-point-z", type FLOAT - SIZE, ///< name "size", type VECTOR3 - SIZE_WIDTH, ///< name "size-width", type FLOAT - SIZE_HEIGHT, ///< name "size-height", type FLOAT - SIZE_DEPTH, ///< name "size-depth", type FLOAT - POSITION, ///< name "position", type VECTOR3 - POSITION_X, ///< name "position-x", type FLOAT - POSITION_Y, ///< name "position-y", type FLOAT - POSITION_Z, ///< name "position-z", type FLOAT - WORLD_POSITION, ///< name "world-position", type VECTOR3 (read-only) - WORLD_POSITION_X, ///< name "world-position-x", type FLOAT (read-only) - WORLD_POSITION_Y, ///< name "world-position-y", type FLOAT (read-only) - WORLD_POSITION_Z, ///< name "world-position-z", type FLOAT (read-only) - ROTATION, ///< name "rotation", type ROTATION - WORLD_ROTATION, ///< name "world-rotation", type ROTATION (read-only) - SCALE, ///< name "scale", type VECTOR3 - SCALE_X, ///< name "scale-x", type FLOAT - SCALE_Y, ///< name "scale-y", type FLOAT - SCALE_Z, ///< name "scale-z", type FLOAT - WORLD_SCALE, ///< name "world-scale", type VECTOR3 (read-only) - VISIBLE, ///< name "visible", type BOOLEAN - COLOR, ///< name "color", type VECTOR4 - COLOR_RED, ///< name "color-red", type FLOAT - COLOR_GREEN, ///< name "color-green", type FLOAT - COLOR_BLUE, ///< name "color-blue", type FLOAT - COLOR_ALPHA, ///< name "color-alpha", type FLOAT - WORLD_COLOR, ///< name "world-color", type VECTOR4 (read-only) - WORLD_MATRIX, ///< name "world-matrix", type MATRIX (read-only) - NAME, ///< name "name", type STRING - SENSITIVE, ///< name "sensitive", type BOOLEAN - LEAVE_REQUIRED, ///< name "leave-required", type BOOLEAN - INHERIT_ROTATION, ///< name "inherit-rotation", type BOOLEAN - INHERIT_SCALE, ///< name "inherit-scale", type BOOLEAN - COLOR_MODE, ///< name "color-mode", type STRING - POSITION_INHERITANCE, ///< name "position-inheritance", type STRING - DRAW_MODE, ///< name "draw-mode", type STRING - SIZE_MODE, ///< name "size-mode", type STRING - SIZE_MODE_FACTOR, ///< name "size-mode-factor", type VECTOR3 + PARENT_ORIGIN = DEFAULT_ACTOR_PROPERTY_START_INDEX, ///< name "parent-origin", type Vector3 + PARENT_ORIGIN_X, ///< name "parent-origin-x", type float + PARENT_ORIGIN_Y, ///< name "parent-origin-y", type float + PARENT_ORIGIN_Z, ///< name "parent-origin-z", type float + ANCHOR_POINT, ///< name "anchor-point", type Vector3 + ANCHOR_POINT_X, ///< name "anchor-point-x", type float + ANCHOR_POINT_Y, ///< name "anchor-point-y", type float + ANCHOR_POINT_Z, ///< name "anchor-point-z", type float + SIZE, ///< name "size", type Vector3 + SIZE_WIDTH, ///< name "size-width", type float + SIZE_HEIGHT, ///< name "size-height", type float + SIZE_DEPTH, ///< name "size-depth", type float + POSITION, ///< name "position", type Vector3 + POSITION_X, ///< name "position-x", type float + POSITION_Y, ///< name "position-y", type float + POSITION_Z, ///< name "position-z", type float + WORLD_POSITION, ///< name "world-position", type Vector3 (read-only) + WORLD_POSITION_X, ///< name "world-position-x", type float (read-only) + WORLD_POSITION_Y, ///< name "world-position-y", type float (read-only) + WORLD_POSITION_Z, ///< name "world-position-z", type float (read-only) + ROTATION, ///< name "rotation", type Quaternion + WORLD_ROTATION, ///< name "world-rotation", type Quaternion (read-only) + SCALE, ///< name "scale", type Vector3 + SCALE_X, ///< name "scale-x", type float + SCALE_Y, ///< name "scale-y", type float + SCALE_Z, ///< name "scale-z", type float + WORLD_SCALE, ///< name "world-scale", type Vector3 (read-only) + VISIBLE, ///< name "visible", type bool + COLOR, ///< name "color", type Vector4 + COLOR_RED, ///< name "color-red", type float + COLOR_GREEN, ///< name "color-green", type float + COLOR_BLUE, ///< name "color-blue", type float + COLOR_ALPHA, ///< name "color-alpha", type float + WORLD_COLOR, ///< name "world-color", type Vector4 (read-only) + WORLD_MATRIX, ///< name "world-matrix", type Matrix (read-only) + NAME, ///< name "name", type std::string + SENSITIVE, ///< name "sensitive", type bool + LEAVE_REQUIRED, ///< name "leave-required", type bool + INHERIT_ROTATION, ///< name "inherit-rotation", type bool + INHERIT_SCALE, ///< name "inherit-scale", type bool + COLOR_MODE, ///< name "color-mode", type std::string + POSITION_INHERITANCE, ///< name "position-inheritance", type std::string + DRAW_MODE, ///< name "draw-mode", type std::string + SIZE_MODE, ///< name "size-mode", type std::string + SIZE_MODE_FACTOR, ///< name "size-mode-factor", type Vector3 }; }; diff --git a/dali/public-api/actors/camera-actor.h b/dali/public-api/actors/camera-actor.h index ec8a4fb..6e5bb06 100644 --- a/dali/public-api/actors/camera-actor.h +++ b/dali/public-api/actors/camera-actor.h @@ -78,20 +78,20 @@ public: { enum { - TYPE = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< name "type", type STRING - PROJECTION_MODE, ///< name "projection-mode", type STRING - FIELD_OF_VIEW, ///< name "field-of-view", type FLOAT - ASPECT_RATIO, ///< name "aspect-ratio", type FLOAT - NEAR_PLANE_DISTANCE, ///< name "near-plane-distance", type FLOAT - FAR_PLANE_DISTANCE, ///< name "far-plane-distance", type FLOAT - LEFT_PLANE_DISTANCE, ///< name "left-plane-distance", type FLOAT - RIGHT_PLANE_DISTANCE, ///< name "right-plane-distance", type FLOAT - TOP_PLANE_DISTANCE, ///< name "top-plane-distance", type FLOAT - BOTTOM_PLANE_DISTANCE, ///< name "bottom-plane-distance", type FLOAT - TARGET_POSITION, ///< name "target-position", type VECTOR3 - PROJECTION_MATRIX, ///< name "projection-matrix", type MATRIX - VIEW_MATRIX, ///< name "view-matrix", type MATRIX - INVERT_Y_AXIS, ///< name "invert-y-axis", type BOOLEAN + TYPE = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< name "type", type std::string + PROJECTION_MODE, ///< name "projection-mode", type std::string + FIELD_OF_VIEW, ///< name "field-of-view", type float + ASPECT_RATIO, ///< name "aspect-ratio", type float + NEAR_PLANE_DISTANCE, ///< name "near-plane-distance", type float + FAR_PLANE_DISTANCE, ///< name "far-plane-distance", type float + LEFT_PLANE_DISTANCE, ///< name "left-plane-distance", type float + RIGHT_PLANE_DISTANCE, ///< name "right-plane-distance", type float + TOP_PLANE_DISTANCE, ///< name "top-plane-distance", type float + BOTTOM_PLANE_DISTANCE, ///< name "bottom-plane-distance", type float + TARGET_POSITION, ///< name "target-position", type Vector3 + PROJECTION_MATRIX, ///< name "projection-matrix", type Matrix + VIEW_MATRIX, ///< name "view-matrix", type Matrix + INVERT_Y_AXIS, ///< name "invert-y-axis", type bool }; }; diff --git a/dali/public-api/actors/image-actor.h b/dali/public-api/actors/image-actor.h index 5e699a4..1727b46 100644 --- a/dali/public-api/actors/image-actor.h +++ b/dali/public-api/actors/image-actor.h @@ -70,10 +70,10 @@ public: { enum { - PIXEL_AREA = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< name "pixel-area", type RECTANGLE - STYLE, ///< name "style", type STRING - BORDER, ///< name "border", type VECTOR4 - IMAGE, ///< name "image", type MAP {"filename":"", "load-policy":...} + PIXEL_AREA = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< name "pixel-area", type Rect + STYLE, ///< name "style", type std::string + BORDER, ///< name "border", type Vector4 + IMAGE, ///< name "image", type Map {"filename":"", "load-policy":...} }; }; diff --git a/dali/public-api/actors/layer.h b/dali/public-api/actors/layer.h index 699fa1f..0ade1ec 100644 --- a/dali/public-api/actors/layer.h +++ b/dali/public-api/actors/layer.h @@ -73,8 +73,8 @@ public: { enum { - CLIPPING_ENABLE = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< name "clipping-enable", type BOOLEAN - CLIPPING_BOX, ///< name "clipping-box", type RECTANGLE + CLIPPING_ENABLE = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< name "clipping-enable", type bool + CLIPPING_BOX, ///< name "clipping-box", type Rect }; }; diff --git a/dali/public-api/actors/text-actor.h b/dali/public-api/actors/text-actor.h index c9fe7fa..84cf66c 100644 --- a/dali/public-api/actors/text-actor.h +++ b/dali/public-api/actors/text-actor.h @@ -68,28 +68,28 @@ public: { enum { - TEXT = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< name "text" type STRING - FONT, ///< name "font" type STRING - FONT_STYLE, ///< name "font-style" type STRING - OUTLINE_ENABLE, ///< name "outline-enable" type BOOLEAN - OUTLINE_COLOR, ///< name "outline-color" type VECTOR4 - OUTLINE_THICKNESS_WIDTH, ///< name "outline-thickness-width" type VECTOR2 - SMOOTH_EDGE, ///< name "smooth-edge" type FLOAT - GLOW_ENABLE, ///< name "glow-enable" type BOOLEAN - GLOW_COLOR, ///< name "glow-color" type VECTOR4 - GLOW_INTENSITY, ///< name "glow-intensity" type FLOAT - SHADOW_ENABLE, ///< name "shadow-enable" type BOOLEAN - SHADOW_COLOR, ///< name "shadow-color" type VECTOR4 - SHADOW_OFFSET, ///< name "shadow-offset" type VECTOR2 - ITALICS_ANGLE, ///< name "italics-angle" type FLOAT - UNDERLINE, ///< name "underline" type BOOLEAN - WEIGHT, ///< name "weight" type INTEGER - FONT_DETECTION_AUTOMATIC, ///< name "font-detection-automatic" type BOOLEAN - GRADIENT_COLOR, ///< name "gradient-color" type VECTOR4 - GRADIENT_START_POINT, ///< name "gradient-start-point" type VECTOR2 - GRADIENT_END_POINT, ///< name "gradient-end-point" type VECTOR2 - SHADOW_SIZE, ///< name "shadow-size" type FLOAT - TEXT_COLOR, ///< name "text-color" type VECTOR4 + TEXT = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< name "text" type std::string + FONT, ///< name "font" type std::string + FONT_STYLE, ///< name "font-style" type std::string + OUTLINE_ENABLE, ///< name "outline-enable" type bool + OUTLINE_COLOR, ///< name "outline-color" type Vector4 + OUTLINE_THICKNESS_WIDTH, ///< name "outline-thickness-width" type Vector2 + SMOOTH_EDGE, ///< name "smooth-edge" type float + GLOW_ENABLE, ///< name "glow-enable" type bool + GLOW_COLOR, ///< name "glow-color" type Vector4 + GLOW_INTENSITY, ///< name "glow-intensity" type float + SHADOW_ENABLE, ///< name "shadow-enable" type bool + SHADOW_COLOR, ///< name "shadow-color" type Vector4 + SHADOW_OFFSET, ///< name "shadow-offset" type Vector2 + ITALICS_ANGLE, ///< name "italics-angle" type float + UNDERLINE, ///< name "underline" type bool + WEIGHT, ///< name "weight" type int + FONT_DETECTION_AUTOMATIC, ///< name "font-detection-automatic" type bool + GRADIENT_COLOR, ///< name "gradient-color" type Vector4 + GRADIENT_START_POINT, ///< name "gradient-start-point" type Vector2 + GRADIENT_END_POINT, ///< name "gradient-end-point" type Vector2 + SHADOW_SIZE, ///< name "shadow-size" type float + TEXT_COLOR, ///< name "text-color" type Vector4 }; }; diff --git a/dali/public-api/animation/active-constraint.h b/dali/public-api/animation/active-constraint.h index 0c26d56..e930f2e 100644 --- a/dali/public-api/animation/active-constraint.h +++ b/dali/public-api/animation/active-constraint.h @@ -52,7 +52,7 @@ public: { enum { - WEIGHT = DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX, ///< name "weight", type FLOAT + WEIGHT = DEFAULT_OBJECT_PROPERTY_START_INDEX, ///< name "weight", type float }; }; diff --git a/dali/public-api/animation/path.h b/dali/public-api/animation/path.h index 9107a5f..add5833 100644 --- a/dali/public-api/animation/path.h +++ b/dali/public-api/animation/path.h @@ -46,8 +46,8 @@ public: { enum { - POINTS = DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX, ///< name "points", type VECTOR3 - CONTROL_POINTS, ///< name "control-points", type VECTOR3 + POINTS = DEFAULT_OBJECT_PROPERTY_START_INDEX, ///< name "points", type Vector3 + CONTROL_POINTS, ///< name "control-points", type Vector3 }; }; diff --git a/dali/public-api/events/pan-gesture-detector.h b/dali/public-api/events/pan-gesture-detector.h index 11cceab..e75a214 100644 --- a/dali/public-api/events/pan-gesture-detector.h +++ b/dali/public-api/events/pan-gesture-detector.h @@ -68,13 +68,13 @@ public: { enum { - SCREEN_POSITION = DEFAULT_GESTURE_DETECTOR_PROPERTY_START_INDEX, ///< name "screen-position", type VECTOR2 - SCREEN_DISPLACEMENT, ///< name "screen-displacement", type VECTOR2 - SCREEN_VELOCITY, ///< name "screen-velocity", type VECTOR2 - LOCAL_POSITION, ///< name "local-position", type VECTOR2 - LOCAL_DISPLACEMENT, ///< name "local-displacement", type VECTOR2 - LOCAL_VELOCITY, ///< name "local-velocity", type VECTOR2 - PANNING, ///< name "panning", type BOOLEAN + SCREEN_POSITION = DEFAULT_GESTURE_DETECTOR_PROPERTY_START_INDEX, ///< name "screen-position", type Vector2 + SCREEN_DISPLACEMENT, ///< name "screen-displacement", type Vector2 + SCREEN_VELOCITY, ///< name "screen-velocity", type Vector2 + LOCAL_POSITION, ///< name "local-position", type Vector2 + LOCAL_DISPLACEMENT, ///< name "local-displacement", type Vector2 + LOCAL_VELOCITY, ///< name "local-velocity", type Vector2 + PANNING, ///< name "panning", type bool }; }; diff --git a/dali/public-api/geometry/animatable-vertex.h b/dali/public-api/geometry/animatable-vertex.h index 16ce066..f9b4022 100644 --- a/dali/public-api/geometry/animatable-vertex.h +++ b/dali/public-api/geometry/animatable-vertex.h @@ -58,9 +58,9 @@ public: { enum { - POSITION = DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX, ///< name prefix "position-", type VECTOR3 - COLOR, ///< name prefix "color-", type VECTOR4 - TEXTURE_COORDS, ///< name prefix "texture-coords-", type VECTOR2 + POSITION = DEFAULT_OBJECT_PROPERTY_START_INDEX, ///< name prefix "position-", type Vector3 + COLOR, ///< name prefix "color-", type Vector4 + TEXTURE_COORDS, ///< name prefix "texture-coords-", type Vector2 }; }; diff --git a/dali/public-api/object/property-index-ranges.h b/dali/public-api/object/property-index-ranges.h index 10f1d10..faabd6f 100644 --- a/dali/public-api/object/property-index-ranges.h +++ b/dali/public-api/object/property-index-ranges.h @@ -32,19 +32,19 @@ namespace Dali */ enum PropertyRanges { - DEFAULT_ACTOR_PROPERTY_START_INDEX = 0, ///< Start index for Actor (and other base classes). - DEFAULT_ACTOR_PROPERTY_MAX_COUNT = 10000, ///< Actor range: 0 to 9999 + DEFAULT_OBJECT_PROPERTY_START_INDEX = 0, ///< For all objects deriving from Handle (including Actors). - DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX = DEFAULT_ACTOR_PROPERTY_START_INDEX, ///< For non-Actor objects. + DEFAULT_ACTOR_PROPERTY_START_INDEX = DEFAULT_OBJECT_PROPERTY_START_INDEX, ///< Start index for Actor. + DEFAULT_ACTOR_PROPERTY_MAX_COUNT = 10000, ///< Actor range: 0 to 9999 DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX = DEFAULT_ACTOR_PROPERTY_START_INDEX + DEFAULT_ACTOR_PROPERTY_MAX_COUNT, ///< Property start index for classes deriving directly from Actor. DEFAULT_PROPERTY_MAX_COUNT_PER_DERIVATION = 10000, ///< Second-level and onwards derived objects should increment their start index by this. - DEFAULT_GESTURE_DETECTOR_PROPERTY_START_INDEX = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< Used by PanGestureDetector. + DEFAULT_GESTURE_DETECTOR_PROPERTY_START_INDEX = DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX, ///< Used by PanGestureDetector. PROPERTY_REGISTRATION_START_INDEX = 10000000, ///< The index when registering a property should start from this number. - DEFAULT_PROPERTY_MAX_COUNT = PROPERTY_REGISTRATION_START_INDEX, ///< Default Property Range: 0 to 9999999 + DEFAULT_PROPERTY_MAX_COUNT = PROPERTY_REGISTRATION_START_INDEX, ///< Default Property Range: 0 to 9999999 PROPERTY_REGISTRATION_MAX_INDEX = 19999999, ///< The maximum index supported when registering a property PROPERTY_CUSTOM_START_INDEX = 50000000, ///< The index at which custom properties start diff --git a/dali/public-api/render-tasks/render-task.h b/dali/public-api/render-tasks/render-task.h index 4ce7e2a..28ab3e8 100644 --- a/dali/public-api/render-tasks/render-task.h +++ b/dali/public-api/render-tasks/render-task.h @@ -86,9 +86,9 @@ public: { enum { - VIEWPORT_POSITION = DEFAULT_DERIVED_HANDLE_PROPERTY_START_INDEX, ///< name "viewport-position", type VECTOR2 - VIEWPORT_SIZE, ///< name "viewport-size", type VECTOR2 - CLEAR_COLOR, ///< name "clear-color", type VECTOR4 + VIEWPORT_POSITION = DEFAULT_OBJECT_PROPERTY_START_INDEX, ///< name "viewport-position", type Vector2 + VIEWPORT_SIZE, ///< name "viewport-size", type Vector2 + CLEAR_COLOR, ///< name "clear-color", type Vector4 }; }; diff --git a/dali/public-api/scripting/scripting.h b/dali/public-api/scripting/scripting.h index 94ae209..7e37bd9 100644 --- a/dali/public-api/scripting/scripting.h +++ b/dali/public-api/scripting/scripting.h @@ -219,14 +219,14 @@ DALI_IMPORT_API Vector3 GetAnchorConstant( const std::string& value ); * * @param[in] map The property value map with the following valid fields: * @code - * "filename": type STRING - * "load-policy" type STRING (enum) - * "release-policy" type STRING (enum) - * "width" type FLOAT - * "height" type FLOAT - * "pixel-format" type STRING (enum) - * "scaling-mode" type STRING (enum) - * "type" type STRING (FrameBufferImage|BufferImage|ResourceImage(default)) + * "filename": type std::string + * "load-policy" type std::string (enum) + * "release-policy" type std::string (enum) + * "width" type float + * "height" type float + * "pixel-format" type std::string (enum) + * "scaling-mode" type std::string (enum) + * "type" type std::string (FrameBufferImage|BufferImage|ResourceImage(default)) * @endcode * Some fields are optional and some only pertain to a specific type. * @@ -241,26 +241,26 @@ DALI_IMPORT_API Image NewImage( const Property::Value& map ); * @code * // a program can be specified as string or a filename. * // some fields may be ignored depending on the geometry-type - * "program": type MAP + * "program": type Map * { - * "vertex": type STRING - * "fragment": type STRING - * "vertex-prefix": type STRING - * "fragment-prefix": type STRING - * "text-vertex": type STRING - * "text-fragment": type STRING - * "vertex-filename": type STRING - * "fragment-filename": type STRING - * "vertex-prefix-filename": type STRING - * "fragment-prefix-filename":type STRING - * "text-vertex-filename": type STRING - * "text-fragment-filename": type STRING - * "geometry-type": type STRING (enum) - * "geometry-hints": type STRING (enum) + * "vertex": type std::string + * "fragment": type std::string + * "vertex-prefix": type std::string + * "fragment-prefix": type std::string + * "text-vertex": type std::string + * "text-fragment": type std::string + * "vertex-filename": type std::string + * "fragment-filename": type std::string + * "vertex-prefix-filename": type std::string + * "fragment-prefix-filename": type std::string + * "text-vertex-filename": type std::string + * "text-fragment-filename": type std::string + * "geometry-type": type std::string (enum) + * "geometry-hints": type std::string (enum) * } * // uniforms must be specified to be registered - * "uUniform1": type FLOAT, - * "uUniform2": type FLOAT, etc + * "uUniform1": type float, + * "uUniform2": type float, etc * @endcode * * @return a pointer to a newly created object. diff --git a/dali/public-api/shader-effects/shader-effect.h b/dali/public-api/shader-effects/shader-effect.h index 61f967e..1778968 100644 --- a/dali/public-api/shader-effects/shader-effect.h +++ b/dali/public-api/shader-effects/shader-effect.h @@ -170,10 +170,10 @@ public: { enum { - GRID_DENSITY = DEFAULT_ACTOR_PROPERTY_START_INDEX, ///< name "grid-density", type FLOAT - IMAGE, ///< name "image", type MAP {"filename":"", "load-policy":...} - PROGRAM, ///< name "program", type MAP {"vertex-prefix":"","fragment-prefix":"","vertex":"","fragment":""} - GEOMETRY_HINTS ///< name "geometry-hints", type INTEGER (bitfield) values from enum GeometryHints + GRID_DENSITY = DEFAULT_ACTOR_PROPERTY_START_INDEX, ///< name "grid-density", type float + IMAGE, ///< name "image", type Map {"filename":"", "load-policy":...} + PROGRAM, ///< name "program", type Map {"vertex-prefix":"","fragment-prefix":"","vertex":"","fragment":""} + GEOMETRY_HINTS ///< name "geometry-hints", type int (bitfield) values from enum GeometryHints }; };