X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fprimitive%2Fprimitive-visual.cpp;h=103529bfacd85796aa54b80c7bbd80162497ca8e;hb=refs%2Fchanges%2F91%2F170491%2F7;hp=78f4c884ca505e632cb9472491ccdb29b56cb1e7;hpb=fb0339fee98523cbf3e527ddd8125660aa441c6c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp index 78f4c88..103529b 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) 2018 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. @@ -27,7 +27,7 @@ #include // INTERNAL INCLUDES -#include +#include #include #include @@ -46,12 +46,13 @@ 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, CONICAL_FRUSTRUM ) // deprecated 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 @@ -70,8 +71,8 @@ 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 +91,12 @@ 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 CONICAL_FRUSTRUM_LABEL( "CONICAL_FRUSTRUM" ); // deprecated 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" ); @@ -166,11 +168,10 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( precision mediump float;\n varying mediump vec3 vIllumination;\n uniform lowp vec4 uColor;\n - uniform lowp vec4 mixColor;\n - + uniform lowp vec3 mixColor;\n void main()\n {\n - vec4 baseColor = mixColor * uColor;\n + vec4 baseColor = vec4(mixColor, 1.0) * uColor;\n gl_FragColor = vec4( vIllumination.rgb * baseColor.rgb, baseColor.a );\n }\n ); @@ -185,7 +186,7 @@ PrimitiveVisualPtr PrimitiveVisual::New( VisualFactoryCache& factoryCache, const } PrimitiveVisual::PrimitiveVisual( VisualFactoryCache& factoryCache ) -: Visual::Base( factoryCache ), +: Visual::Base( factoryCache, Visual::FittingMode::FIT_KEEP_ASPECT_RATIO ), mScaleDimensions( Vector3::ONE ), mScaleTopRadius( DEFAULT_SCALE_TOP_RADIUS ), mScaleBottomRadius( DEFAULT_SCALE_BOTTOM_RADIUS ), @@ -218,14 +219,23 @@ void PrimitiveVisual::DoSetProperties( const Property::Map& propertyMap ) } // By virtue of DoSetProperties being called last, this will override - // anything set by DevelVisual::Property::MIX_COLOR + // anything set by Toolkit::Visual::Property::MIX_COLOR Property::Value* colorValue = propertyMap.Find( Toolkit::PrimitiveVisual::Property::MIX_COLOR, MIX_COLOR ); if( colorValue ) { Vector4 color; if( colorValue->Get( color ) ) { - SetMixColor( color ); + Property::Type type = colorValue->GetType(); + if( type == Property::VECTOR4 ) + { + SetMixColor( color ); + } + else if( type == Property::VECTOR3 ) + { + Vector3 color3(color); + SetMixColor( color3 ); + } } } @@ -409,12 +419,15 @@ void PrimitiveVisual::DoSetOnStage( Actor& actor ) InitializeRenderer(); actor.AddRenderer( mImpl->mRenderer ); + + // Primitive generated and ready to display + ResourceReady( Toolkit::Visual::ResourceStatus::READY ); } void PrimitiveVisual::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( Toolkit::DevelVisual::Property::TYPE, Toolkit::Visual::PRIMITIVE ); + map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::PRIMITIVE ); map.Insert( Toolkit::PrimitiveVisual::Property::MIX_COLOR, mImpl->mMixColor ); map.Insert( Toolkit::PrimitiveVisual::Property::SHAPE, mPrimitiveType ); map.Insert( Toolkit::PrimitiveVisual::Property::SLICES, mSlices ); @@ -429,6 +442,11 @@ void PrimitiveVisual::DoCreatePropertyMap( Property::Map& map ) const map.Insert( Toolkit::PrimitiveVisual::Property::LIGHT_POSITION, mLightPosition ); } +void PrimitiveVisual::DoCreateInstancePropertyMap( Property::Map& map ) const +{ + // Do nothing +} + void PrimitiveVisual::OnSetTransform() { if( mImpl->mRenderer ) @@ -455,7 +473,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, mImpl->mMixColor ); + mImpl->mMixColorIndex = DevelHandle::RegisterProperty( mImpl->mRenderer, Toolkit::PrimitiveVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor) ); } void PrimitiveVisual::UpdateShaderUniforms() @@ -498,7 +516,7 @@ void PrimitiveVisual::CreateGeometry() CreateConic( vertices, indices, 0, mScaleBottomRadius, mScaleHeight, mSlices ); break; } - case Toolkit::PrimitiveVisual::Shape::CONICAL_FRUSTRUM: + case Toolkit::PrimitiveVisual::Shape::CONICAL_FRUSTRUM: // deprecated { CreateConic( vertices, indices, mScaleTopRadius, mScaleBottomRadius, mScaleHeight, mSlices ); break; @@ -526,6 +544,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();