X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fmesh%2Fmesh-visual.cpp;h=4d6a4cdc6cda24844da9ffd5a082a55b473a6b26;hp=338497610b46a4e1df6016e2230549cc6155224c;hb=dea624eb348a4926d8761c8a1364f03f9f71acf5;hpb=140fc4e567fa70d1fac89b50cf67b530a4dae0af diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp index 3384976..4d6a4cd 100644 --- a/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp +++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 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,15 +20,14 @@ // EXTERNAL INCLUDES #include -#include -#include +#include +#include #include #include #include -#include //INTERNAL INCLUDES -#include +#include #include #include @@ -46,12 +45,12 @@ namespace Texture LoadTexture( const char* imageUrl, bool generateMipmaps ) { Texture texture; - Dali::BitmapLoader loader = Dali::BitmapLoader::New( imageUrl ); - loader.Load(); - PixelData pixelData = loader.GetPixelData(); - if( pixelData ) + + Devel::PixelBuffer pixelBuffer = LoadImageFromFile( imageUrl ); + if( pixelBuffer ) { - texture = Texture::New( TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight() ); + texture = Texture::New( TextureType::TEXTURE_2D, pixelBuffer.GetPixelFormat(), pixelBuffer.GetWidth(), pixelBuffer.GetHeight() ); + PixelData pixelData = Devel::PixelBuffer::Convert( pixelBuffer ); texture.Upload( pixelData ); if( generateMipmaps ) @@ -83,14 +82,6 @@ enum TextureIndex GLOSS_INDEX = 2u }; -//Property names -const char * const OBJECT_URL_NAME( "objectUrl" ); -const char * const MATERIAL_URL_NAME( "materialUrl" ); -const char * const TEXTURES_PATH_NAME( "texturesPath" ); -const char * const SHADING_MODE_NAME( "shadingMode" ); -const char * const USE_MIPMAPPING_NAME( "useMipmapping" ); -const char * const USE_SOFT_NORMALS_NAME( "useSoftNormals" ); -const char * const LIGHT_POSITION_NAME( "lightPosition" ); //Shading mode DALI_ENUM_TO_STRING_TABLE_BEGIN( SHADING_MODE ) @@ -164,10 +155,12 @@ const char* SIMPLE_FRAGMENT_SHADER = DALI_COMPOSE_SHADER( precision mediump float;\n varying mediump vec3 vIllumination;\n uniform lowp vec4 uColor;\n + uniform lowp vec3 mixColor;\n + uniform lowp float preMultipliedAlpha;\n void main()\n {\n - gl_FragColor = vec4( vIllumination.rgb * uColor.rgb, uColor.a );\n + gl_FragColor = vec4( vIllumination.rgb * uColor.rgb, uColor.a ) * vec4( mixColor, 1.0 );\n }\n ); @@ -241,11 +234,14 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( varying mediump float vSpecular;\n uniform sampler2D sDiffuse;\n uniform lowp vec4 uColor;\n + uniform lowp vec3 mixColor;\n + uniform lowp float preMultipliedAlpha;\n void main()\n {\n vec4 texture = texture2D( sDiffuse, vTexCoord );\n - gl_FragColor = vec4( vIllumination.rgb * texture.rgb * uColor.rgb + vSpecular * 0.3, texture.a * uColor.a );\n + vec4 visualMixColor = vec4( mixColor, 1.0 );\n + gl_FragColor = vec4( vIllumination.rgb * texture.rgb * uColor.rgb * visualMixColor.rgb + vSpecular * 0.3, texture.a * uColor.a * visualMixColor.a );\n }\n ); @@ -326,31 +322,36 @@ const char* NORMAL_MAP_FRAGMENT_SHADER = DALI_COMPOSE_SHADER( uniform sampler2D sNormal;\n uniform sampler2D sGloss;\n uniform lowp vec4 uColor;\n + uniform lowp vec3 mixColor;\n + uniform lowp float preMultipliedAlpha;\n void main()\n {\n vec4 texture = texture2D( sDiffuse, vTexCoord );\n vec3 normal = normalize( texture2D( sNormal, vTexCoord ).xyz * 2.0 - 1.0 );\n vec4 glossMap = texture2D( sGloss, vTexCoord );\n + vec4 visualMixColor = vec4( mixColor, 1.0 );\n float lightDiffuse = max( 0.0, dot( normal, normalize( vLightDirection ) ) );\n lightDiffuse = lightDiffuse * 0.5 + 0.5;\n float shininess = pow ( max ( dot ( normalize( vHalfVector ), normal ), 0.0 ), 16.0 ) ; - gl_FragColor = vec4( texture.rgb * uColor.rgb * lightDiffuse + shininess * glossMap.rgb, texture.a * uColor.a );\n + gl_FragColor = vec4( texture.rgb * uColor.rgb * visualMixColor.rgb * lightDiffuse + shininess * glossMap.rgb, texture.a * uColor.a * visualMixColor.a );\n }\n ); } // unnamed namespace -MeshVisualPtr MeshVisual::New( VisualFactoryCache& factoryCache ) +MeshVisualPtr MeshVisual::New( VisualFactoryCache& factoryCache, const Property::Map& properties ) { - return new MeshVisual( factoryCache ); + MeshVisualPtr meshVisualPtr( new MeshVisual( factoryCache ) ); + meshVisualPtr->SetProperties( properties ); + return meshVisualPtr; } MeshVisual::MeshVisual( VisualFactoryCache& factoryCache ) -: Visual::Base( factoryCache ), +: Visual::Base( factoryCache, Visual::FittingMode::FIT_KEEP_ASPECT_RATIO, Toolkit::Visual::MESH ), mShadingMode( Toolkit::MeshVisual::ShadingMode::TEXTURED_WITH_DETAILED_SPECULAR_LIGHTING ), mUseTexture( true ), mUseMipmapping( true ), @@ -364,60 +365,119 @@ MeshVisual::~MeshVisual() void MeshVisual::DoSetProperties( const Property::Map& propertyMap ) { - Property::Value* objectUrl = propertyMap.Find( Toolkit::MeshVisual::Property::OBJECT_URL, OBJECT_URL_NAME ); - if( !objectUrl || !objectUrl->Get( mObjectUrl ) ) + for( Property::Map::SizeType iter = 0; iter < propertyMap.Count(); ++iter ) { - DALI_LOG_ERROR( "Fail to provide object URL to the MeshVisual object.\n" ); + KeyValuePair keyValue = propertyMap.GetKeyValue( iter ); + if( keyValue.first.type == Property::Key::INDEX ) + { + DoSetProperty( keyValue.first.indexKey, keyValue.second ); + } + else + { + if( keyValue.first == OBJECT_URL_NAME ) + { + DoSetProperty( Toolkit::MeshVisual::Property::OBJECT_URL, keyValue.second ); + } + else if( keyValue.first == MATERIAL_URL_NAME ) + { + DoSetProperty( Toolkit::MeshVisual::Property::MATERIAL_URL, keyValue.second ); + } + else if( keyValue.first == TEXTURES_PATH_NAME ) + { + DoSetProperty( Toolkit::MeshVisual::Property::TEXTURES_PATH, keyValue.second ); + } + else if( keyValue.first == SHADING_MODE_NAME ) + { + DoSetProperty( Toolkit::MeshVisual::Property::SHADING_MODE, keyValue.second ); + } + else if( keyValue.first == USE_MIPMAPPING_NAME ) + { + DoSetProperty( Toolkit::MeshVisual::Property::USE_MIPMAPPING, keyValue.second ); + } + else if( keyValue.first == USE_SOFT_NORMALS_NAME ) + { + DoSetProperty( Toolkit::MeshVisual::Property::USE_SOFT_NORMALS, keyValue.second ); + } + else if( keyValue.first == LIGHT_POSITION_NAME ) + { + DoSetProperty( Toolkit::MeshVisual::Property::LIGHT_POSITION, keyValue.second ); + } + } } - Property::Value* materialUrl = propertyMap.Find( Toolkit::MeshVisual::Property::MATERIAL_URL, MATERIAL_URL_NAME ); - if( !materialUrl || !materialUrl->Get( mMaterialUrl ) || mMaterialUrl.empty() ) + if( mMaterialUrl.empty() ) { mUseTexture = false; } - Property::Value* imagesUrl = propertyMap.Find( Toolkit::MeshVisual::Property::TEXTURES_PATH, TEXTURES_PATH_NAME ); - if( !imagesUrl || !imagesUrl->Get( mTexturesPath ) ) + if( mLightPosition == Vector3::ZERO ) { - //Default behaviour is to assume files are in the same directory, - // or have their locations detailed in full when supplied. - mTexturesPath.clear(); - } - - Property::Value* shadingMode = propertyMap.Find( Toolkit::MeshVisual::Property::SHADING_MODE, SHADING_MODE_NAME ); - if( shadingMode ) - { - Scripting::GetEnumerationProperty( *shadingMode, SHADING_MODE_TABLE, SHADING_MODE_TABLE_COUNT, mShadingMode ); - } - - Property::Value* useMipmapping = propertyMap.Find( Toolkit::MeshVisual::Property::USE_MIPMAPPING, USE_MIPMAPPING_NAME ); - if( useMipmapping ) - { - useMipmapping->Get( mUseMipmapping ); - } + // Default behaviour is to place the light directly in front of the object, + // at a reasonable distance to light everything on screen. + Stage stage = Stage::GetCurrent(); - Property::Value* useSoftNormals = propertyMap.Find( Toolkit::MeshVisual::Property::USE_SOFT_NORMALS, USE_SOFT_NORMALS_NAME ); - if( useSoftNormals ) - { - useSoftNormals->Get( mUseSoftNormals ); + mLightPosition = Vector3( stage.GetSize().width / 2, stage.GetSize().height / 2, stage.GetSize().width * 5 ); } +} - Property::Value* lightPosition = propertyMap.Find( Toolkit::MeshVisual::Property::LIGHT_POSITION, LIGHT_POSITION_NAME ); - if( lightPosition ) +void MeshVisual::DoSetProperty( Property::Index index, const Property::Value& value ) +{ + switch( index ) { - if( !lightPosition->Get( mLightPosition ) ) + case Toolkit::MeshVisual::Property::OBJECT_URL: { - DALI_LOG_ERROR( "Invalid value passed for light position in MeshRenderer object.\n" ); - mLightPosition = Vector3::ZERO; + if( !value.Get( mObjectUrl ) ) + { + DALI_LOG_ERROR("MeshVisual: property objectUrl is the wrong type, use STRING\n"); + } + break; + } + case Toolkit::MeshVisual::Property::MATERIAL_URL: + { + if( ! value.Get( mMaterialUrl ) ) + { + DALI_LOG_ERROR("MeshVisual: property materialUrl is the wrong type, use STRING\n"); + } + break; + } + case Toolkit::MeshVisual::Property::TEXTURES_PATH: + { + if( ! value.Get( mTexturesPath ) ) + { + mTexturesPath.clear(); + } + break; + } + case Toolkit::MeshVisual::Property::SHADING_MODE: + { + Scripting::GetEnumerationProperty( value, SHADING_MODE_TABLE, SHADING_MODE_TABLE_COUNT, mShadingMode ); + break; + } + case Toolkit::MeshVisual::Property::USE_MIPMAPPING: + { + if( !value.Get( mUseMipmapping ) ) + { + DALI_LOG_ERROR("MeshVisual: property useMipmapping is the wrong type, use BOOLEAN\n"); + } + break; + } + case Toolkit::MeshVisual::Property::USE_SOFT_NORMALS: + { + if( !value.Get( mUseSoftNormals ) ) + { + DALI_LOG_ERROR("MeshVisual: property useSoftNormals is the wrong type, use BOOLEAN\n"); + } + break; + } + case Toolkit::MeshVisual::Property::LIGHT_POSITION: + { + if( !value.Get( mLightPosition ) ) + { + mLightPosition = Vector3::ZERO; + DALI_LOG_ERROR("MeshVisual: property lightPosition is the wrong type, use VECTOR3\n"); + } + break; } - } - else - { - //Default behaviour is to place the light directly in front of the object, - // at a reasonable distance to light everything on screen. - Stage stage = Stage::GetCurrent(); - - mLightPosition = Vector3( stage.GetSize().width / 2, stage.GetSize().height / 2, stage.GetSize().width * 5 ); } } @@ -429,24 +489,20 @@ void MeshVisual::OnSetTransform() } } -void MeshVisual::SetSize( const Vector2& size ) -{ - Visual::Base::SetSize( size ); - - // ToDo: renderer responds to the size change -} - -void MeshVisual::DoSetOnStage( Actor& actor ) +void MeshVisual::DoSetOnScene( Actor& actor ) { InitializeRenderer(); actor.AddRenderer( mImpl->mRenderer ); + + // Mesh loaded and ready to display + ResourceReady( Toolkit::Visual::ResourceStatus::READY ); } void MeshVisual::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( Toolkit::VisualProperty::TYPE, Toolkit::Visual::MESH ); + map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::MESH ); map.Insert( Toolkit::MeshVisual::Property::OBJECT_URL, mObjectUrl ); map.Insert( Toolkit::MeshVisual::Property::MATERIAL_URL, mMaterialUrl ); map.Insert( Toolkit::MeshVisual::Property::TEXTURES_PATH, mTexturesPath ); @@ -456,15 +512,9 @@ void MeshVisual::DoCreatePropertyMap( Property::Map& map ) const map.Insert( Toolkit::MeshVisual::Property::LIGHT_POSITION, mLightPosition ); } -void MeshVisual::DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ) -{ - // TODO -} - -Dali::Property::Value MeshVisual::DoGetProperty( Dali::Property::Index index ) +void MeshVisual::DoCreateInstancePropertyMap( Property::Map& map ) const { - // TODO - return Dali::Property::Value(); + // Do nothing } void MeshVisual::InitializeRenderer()