X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fwireframe%2Fwireframe-visual.cpp;h=7611dd63b52ed538e062c3a1fd3e08133c329afa;hb=HEAD;hp=9494d9f9b0cf9473adb3b4db11bb827e3dcd74a6;hpb=177a529f5796ca4abe24fc5eafd7cddff423be3b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp index 9494d9f..ae76d87 100644 --- a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp +++ b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 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. @@ -34,7 +34,6 @@ namespace Internal { namespace { -const int CUSTOM_PROPERTY_COUNT(5); const char* const POSITION_ATTRIBUTE_NAME("aPosition"); const char* const INDEX_NAME("indices"); } // namespace @@ -69,7 +68,7 @@ WireframeVisualPtr WireframeVisual::New(VisualFactoryCache& factoryCache, Visual } WireframeVisual::WireframeVisual(VisualFactoryCache& factoryCache, Visual::BasePtr actualVisual) -: Visual::Base(factoryCache, Visual::FittingMode::FILL, actualVisual ? actualVisual->GetType() : Toolkit::Visual::WIREFRAME), +: Visual::Base(factoryCache, Visual::FittingMode::DONT_CARE, actualVisual ? actualVisual->GetType() : Toolkit::Visual::WIREFRAME), mActualVisual(actualVisual) { } @@ -144,8 +143,7 @@ void WireframeVisual::OnInitialize() Shader shader = mFactoryCache.GetShader(VisualFactoryCache::WIREFRAME_SHADER); if(!shader) { - shader = Shader::New(SHADER_WIREFRAME_VISUAL_SHADER_VERT, SHADER_WIREFRAME_VISUAL_SHADER_FRAG); - mFactoryCache.SaveShader(VisualFactoryCache::WIREFRAME_SHADER, shader); + shader = mFactoryCache.GenerateAndSaveShader(VisualFactoryCache::WIREFRAME_SHADER, SHADER_WIREFRAME_VISUAL_SHADER_VERT, SHADER_WIREFRAME_VISUAL_SHADER_FRAG); } Geometry geometry = mFactoryCache.GetGeometry(VisualFactoryCache::WIREFRAME_GEOMETRY); @@ -156,11 +154,10 @@ void WireframeVisual::OnInitialize() } //Create the renderer - mImpl->mRenderer = Renderer::New(geometry, shader); - mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT); + mImpl->mRenderer = VisualRenderer::New(geometry, shader); //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } Geometry WireframeVisual::CreateQuadWireframeGeometry() @@ -200,7 +197,7 @@ void WireframeVisual::OnSetTransform() if(mImpl->mRenderer) { //Register transform properties - mImpl->mTransform.RegisterUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); + mImpl->mTransform.SetUniforms(mImpl->mRenderer, Direction::LEFT_TO_RIGHT); } }