X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fprimitive%2Fprimitive-visual.cpp;h=449deb7073a25ccf05fbb0ae4786979d4a7c3fe3;hp=51a9b29c758e139b6c7b1dcbec2f13bc49f9bf8f;hb=bfa5276cfac80f6dd1f874503e6fefb74a90b19e;hpb=ca4209fb071e5c353a7e528098a2e497765118d8 diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp index 51a9b29..449deb7 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -20,9 +20,8 @@ // EXTERNAL INCLUDES #include -#include +#include #include -#include #include #include @@ -46,32 +45,19 @@ namespace // shapes DALI_ENUM_TO_STRING_TABLE_BEGIN( SHAPE_TYPE ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::PrimitiveVisual::Shape, SPHERE ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::PrimitiveVisual::Shape, CONICAL_FRUSTRUM ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::PrimitiveVisual::Shape, CONE ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::PrimitiveVisual::Shape, CYLINDER ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::PrimitiveVisual::Shape, CUBE ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::PrimitiveVisual::Shape, OCTAHEDRON ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::PrimitiveVisual::Shape, BEVELLED_CUBE ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::PrimitiveVisual::Shape, CONICAL_FRUSTUM ) DALI_ENUM_TO_STRING_TABLE_END( SHAPE_TYPE ) -//Property names -const char * const PRIMITIVE_SHAPE( "shape" ); -const char * const SLICES( "slices" ); -const char * const STACKS( "stacks" ); -const char * const SCALE_TOP_RADIUS( "scaleTopRadius" ); -const char * const SCALE_BOTTOM_RADIUS( "scaleBottomRadius" ); -const char * const SCALE_HEIGHT( "scaleHeight" ); -const char * const SCALE_RADIUS( "scaleRadius" ); -const char * const SCALE_DIMENSIONS( "scaleDimensions" ); -const char * const BEVEL_PERCENTAGE( "bevelPercentage" ); -const char * const BEVEL_SMOOTHNESS( "bevelSmoothness" ); -const char * const LIGHT_POSITION_UNIFORM_NAME( "lightPosition" ); - //Primitive property defaults const int DEFAULT_SLICES = 128; ///< For spheres and conics const int DEFAULT_STACKS = 128; ///< For spheres and conics -const float DEFAULT_SCALE_TOP_RADIUS = 1.0; ///< For conical frustrums -const float DEFAULT_SCALE_BOTTOM_RADIUS = 1.5; ///< For cones and conical frustrums +const float DEFAULT_SCALE_TOP_RADIUS = 1.0; ///< For conical frustums +const float DEFAULT_SCALE_BOTTOM_RADIUS = 1.5; ///< For cones and conical frustums const float DEFAULT_SCALE_HEIGHT = 3.0; ///< For all conics const float DEFAULT_SCALE_RADIUS = 1.0; ///< For cylinders const float DEFAULT_BEVEL_PERCENTAGE = 0.0; ///< For bevelled cubes @@ -90,11 +76,11 @@ const float MAX_SMOOTHNESS = 1.0; ///< Maximum bevel smoothness for bevell //Specific shape labels. const char * const SPHERE_LABEL( "SPHERE" ); const char * const CONE_LABEL( "CONE" ); -const char * const CONICAL_FRUSTRUM_LABEL( "CONICAL_FRUSTRUM" ); const char * const CYLINDER_LABEL( "CYLINDER" ); const char * const CUBE_LABEL( "CUBE" ); const char * const OCTAHEDRON_LABEL( "OCTAHEDRON" ); const char * const BEVELLED_CUBE_LABEL( "BEVELLED_CUBE" ); +const char * const CONICAL_FRUSTUM_LABEL( "CONICAL_FRUSTUM" ); //Shader properties const char * const OBJECT_MATRIX_UNIFORM_NAME( "uObjectMatrix" ); @@ -167,10 +153,9 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( varying mediump vec3 vIllumination;\n uniform lowp vec4 uColor;\n uniform lowp vec3 mixColor;\n - uniform lowp float opacity;\n void main()\n {\n - vec4 baseColor = vec4(mixColor, opacity) * uColor;\n + vec4 baseColor = vec4(mixColor, 1.0) * uColor;\n gl_FragColor = vec4( vIllumination.rgb * baseColor.rgb, baseColor.a );\n }\n ); @@ -185,7 +170,7 @@ PrimitiveVisualPtr PrimitiveVisual::New( VisualFactoryCache& factoryCache, const } PrimitiveVisual::PrimitiveVisual( VisualFactoryCache& factoryCache ) -: Visual::Base( factoryCache ), +: Visual::Base( factoryCache, Visual::FittingMode::FIT_KEEP_ASPECT_RATIO, Toolkit::Visual::PRIMITIVE ), mScaleDimensions( Vector3::ONE ), mScaleTopRadius( DEFAULT_SCALE_TOP_RADIUS ), mScaleBottomRadius( DEFAULT_SCALE_BOTTOM_RADIUS ), @@ -413,14 +398,14 @@ void PrimitiveVisual::GetNaturalSize( Vector2& naturalSize ) naturalSize.y = mObjectDimensions.y; } -void PrimitiveVisual::DoSetOnStage( Actor& actor ) +void PrimitiveVisual::DoSetOnScene( Actor& actor ) { InitializeRenderer(); actor.AddRenderer( mImpl->mRenderer ); // Primitive generated and ready to display - ResourceReady(); + ResourceReady( Toolkit::Visual::ResourceStatus::READY ); } void PrimitiveVisual::DoCreatePropertyMap( Property::Map& map ) const @@ -472,7 +457,7 @@ void PrimitiveVisual::InitializeRenderer() // Register transform properties mImpl->mTransform.RegisterUniforms( mImpl->mRenderer, Direction::LEFT_TO_RIGHT ); - mImpl->mMixColorIndex = DevelHandle::RegisterProperty( mImpl->mRenderer, Toolkit::PrimitiveVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor) ); + mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty( Toolkit::PrimitiveVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor) ); } void PrimitiveVisual::UpdateShaderUniforms() @@ -515,11 +500,6 @@ void PrimitiveVisual::CreateGeometry() CreateConic( vertices, indices, 0, mScaleBottomRadius, mScaleHeight, mSlices ); break; } - case Toolkit::PrimitiveVisual::Shape::CONICAL_FRUSTRUM: - { - CreateConic( vertices, indices, mScaleTopRadius, mScaleBottomRadius, mScaleHeight, mSlices ); - break; - } case Toolkit::PrimitiveVisual::Shape::CYLINDER: { //Create a conic with equal radii on the top and bottom. @@ -543,6 +523,11 @@ void PrimitiveVisual::CreateGeometry() CreateBevelledCube( vertices, indices, mScaleDimensions, mBevelPercentage, mBevelSmoothness ); break; } + case Toolkit::PrimitiveVisual::Shape::CONICAL_FRUSTUM: + { + CreateConic( vertices, indices, mScaleTopRadius, mScaleBottomRadius, mScaleHeight, mSlices ); + break; + } } mGeometry = Geometry::New();