From 05d9f7a25bd9f4320a0e1fece8ec0ede819afe7d Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Mon, 11 Jul 2016 15:45:32 +0100 Subject: [PATCH] Moved TextureSet::SetImage() to separate devel-api module Change-Id: I8aa9355de986be22f6ce679dc4a49094e90c343f --- .../dali-toolkit-test-utils/mesh-builder.cpp | 10 ++++-- .../dali-toolkit-test-utils/test-actor-utils.cpp | 11 ++++--- .../controls/bloom-view/bloom-view-impl.cpp | 5 +-- .../controls/bubble-effect/bubble-emitter-impl.cpp | 9 +++--- .../controls/effects-view/effects-view-impl.cpp | 5 +-- .../page-turn-view/page-turn-view-impl.cpp | 5 +-- .../controls/renderers/image-atlas-manager.cpp | 5 +-- .../controls/renderers/image/image-renderer.cpp | 11 ++++--- .../controls/renderers/npatch/npatch-renderer.cpp | 5 +-- .../controls/renderers/svg/svg-renderer.cpp | 3 +- .../internal/filters/blur-two-pass-filter.cpp | 5 +-- dali-toolkit/internal/filters/emboss-filter.cpp | 9 ++++-- .../rendering/vector-based/vector-blob-atlas.cpp | 3 +- dali-toolkit/internal/text/text-scroller.cpp | 3 +- .../src/rendering/texture-set-api.cpp | 37 +--------------------- 15 files changed, 57 insertions(+), 69 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp index 978dc74..d94e548 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -14,8 +14,13 @@ * limitations under the License. * */ + +// CLASS HEADER #include "mesh-builder.h" +// EXTERNAL INCLUDES +#include + namespace Dali { @@ -28,10 +33,11 @@ TextureSet CreateTextureSet() { return TextureSet::New(); } + TextureSet CreateTextureSet( Image image ) { TextureSet textureSet = TextureSet::New(); - textureSet.SetImage( 0u, image ); + TextureSetImage( textureSet, 0u, image ); return textureSet; } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp index 9be97bc..083e582 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp @@ -15,14 +15,17 @@ * */ -// HEADER +// CLASS HEADER #include "test-actor-utils.h" -#include "mesh-builder.h" // EXTERNAL INCLUDES #include +#include #include +// INTERNAL INCLUDES +#include "mesh-builder.h" + namespace Dali { @@ -81,7 +84,7 @@ Actor CreateRenderableActor( Image texture, const std::string& vertexShader, con if( texture ) { TextureSet textureSet = TextureSet::New(); - textureSet.SetImage( 0u, texture ); + TextureSetImage( textureSet, 0u, texture ); renderer.SetTextures( textureSet ); // Set actor to the size of the texture if set @@ -102,7 +105,7 @@ Image GetTexture( Actor actor ) TextureSet textureSet = renderer.GetTextures(); if( textureSet && textureSet.GetTextureCount() ) { - image = textureSet.GetImage( 0u ); + image = TextureGetImage( textureSet, 0u ); } } } diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp index a2c607f..4f8e79e 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -29,6 +29,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -389,7 +390,7 @@ void BloomView::AllocateResources() rendererMap[ "shader" ] = customShader; mCompositeImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, rendererMap ); TextureSet textureSet = mCompositeImageView.GetRendererAt(0).GetTextures(); - textureSet.SetImage( 1u, mBlurExtractTarget ); + TextureSetImage( textureSet, 1u, mBlurExtractTarget ); // set up target actor for rendering result, i.e. the blurred image mTargetImageView.SetImage(mOutputRenderTarget); diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp index b13765b..2904ece 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -22,6 +22,7 @@ #include #include #include +#include // INTERNAL INCLUDES #include @@ -143,8 +144,8 @@ void BubbleEmitter::OnInitialize() Shader bubbleShader = CreateBubbleShader (mNumBubblePerActor ); mTextureSet = TextureSet::New(); - mTextureSet.SetImage( 0u, mEffectImage ); - mTextureSet.SetImage( 1u, mShapeImage ); + TextureSetImage( mTextureSet, 0u, mEffectImage ); + TextureSetImage( mTextureSet, 1u, mShapeImage ); mBubbleActors.resize( mNumActor ); @@ -200,7 +201,7 @@ void BubbleEmitter::SetBackground( Image bgImage, const Vector3& hsvDelta ) void BubbleEmitter::SetShapeImage( Image shapeImage ) { - mTextureSet.SetImage( 1, shapeImage ); + TextureSetImage( mTextureSet, 1, shapeImage ); } void BubbleEmitter::SetBubbleScale( float scale ) diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp index ae4ac45..332d322 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -26,6 +26,7 @@ #include #include #include +#include #include // INTERNAL INCLUDES @@ -439,7 +440,7 @@ void EffectsView::AllocateResources() mImagePostFilter = FrameBufferImage::New( mTargetSize.width, mTargetSize.height, mPixelFormat, Dali::Image::UNUSED ); TextureSet textureSet = TextureSet::New(); - textureSet.SetImage( 0u, mImagePostFilter); + TextureSetImage( textureSet, 0u, mImagePostFilter ); self.GetRendererAt( 0 ).SetTextures( textureSet ); mRendererPostFilter.SetDepthIndex( DepthIndex::CONTENT ); diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp index 20c57c0..01a335c 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -25,6 +25,7 @@ #include #include #include +#include #include // INTERNAL INCLUDES @@ -291,7 +292,7 @@ void PageTurnView::Page::SetImage( Image image ) textureSet = TextureSet::New(); } - textureSet.SetImage( 0u, image ); + TextureSetImage( textureSet, 0u, image ); } void PageTurnView::Page::UseEffect(Shader newShader) diff --git a/dali-toolkit/internal/controls/renderers/image-atlas-manager.cpp b/dali-toolkit/internal/controls/renderers/image-atlas-manager.cpp index ab8ff18..9697e50 100644 --- a/dali-toolkit/internal/controls/renderers/image-atlas-manager.cpp +++ b/dali-toolkit/internal/controls/renderers/image-atlas-manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,6 +19,7 @@ #include "image-atlas-manager.h" // EXTERNAL HEADER +#include #include namespace Dali @@ -141,7 +142,7 @@ void ImageAtlasManager::CreateNewAtlas() } mAtlasList.push_back( newAtlas ); TextureSet textureSet = TextureSet::New(); - textureSet.SetImage( 0u, newAtlas.GetAtlas() ); + TextureSetImage( textureSet, 0u, newAtlas.GetAtlas() ); mTextureSetList.push_back( textureSet ); } diff --git a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp index 434eecf..3f27923 100644 --- a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -465,7 +466,7 @@ TextureSet ImageRenderer::CreateTextureSet( Vector4& textureRect, const std::str { // use broken image textureSet = TextureSet::New(); - textureSet.SetImage( 0u, RendererFactory::GetBrokenRendererImage() ); + TextureSetImage( textureSet, 0u, RendererFactory::GetBrokenRendererImage() ); } else { @@ -475,7 +476,7 @@ TextureSet ImageRenderer::CreateTextureSet( Vector4& textureRect, const std::str Atlas image = Atlas::New( mPixels.GetWidth(), mPixels.GetHeight(), mPixels.GetPixelFormat() ); image.Upload( mPixels, 0, 0 ); textureSet = TextureSet::New(); - textureSet.SetImage( 0u, image ); + TextureSetImage( textureSet, 0u, image ); } } } @@ -487,7 +488,7 @@ TextureSet ImageRenderer::CreateTextureSet( Vector4& textureRect, const std::str ResourceImage resourceImage = Dali::ResourceImage::New( url, mDesiredSize, mFittingMode, mSamplingMode ); resourceImage.LoadingFinishedSignal().Connect( this, &ImageRenderer::OnImageLoaded ); textureSet = TextureSet::New(); - textureSet.SetImage( 0u, resourceImage ); + TextureSetImage( textureSet, 0u, resourceImage ); } } @@ -826,7 +827,7 @@ void ImageRenderer::ApplyImageToSampler( const Image& image ) textureSet = TextureSet::New(); mImpl->mRenderer.SetTextures( textureSet ); } - textureSet.SetImage( 0u, image ); + TextureSetImage( textureSet, 0u, image ); } } diff --git a/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp b/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp index 3f91eeb..677d5ad 100644 --- a/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/npatch/npatch-renderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -22,6 +22,7 @@ #include #include #include +#include // INTERNAL IINCLUDES #include @@ -534,7 +535,7 @@ void NPatchRenderer::ApplyImageToSampler() TextureSet textureSet = mImpl->mRenderer.GetTextures(); if( textureSet ) { - textureSet.SetImage( 0u, mCroppedImage ); + TextureSetImage( textureSet, 0u, mCroppedImage ); if( mStretchPixelsX.Size() == 1 && mStretchPixelsY.Size() == 1 ) { diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp index 8fbf70a..33c2b30 100644 --- a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include // INTERNAL INCLUDES @@ -230,7 +231,7 @@ void SvgRenderer::ApplyRasterizedImage( PixelData rasterizedPixelData ) if( textureSet ) { - textureSet.SetImage( 0u, texture ); + TextureSetImage( textureSet, 0u, texture ); } } } diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp index ed8dada..8d7fc12 100644 --- a/dali-toolkit/internal/filters/blur-two-pass-filter.cpp +++ b/dali-toolkit/internal/filters/blur-two-pass-filter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -24,6 +24,7 @@ #include #include #include +#include #include // INTERNAL INCLUDES @@ -185,7 +186,7 @@ void BlurTwoPassFilter::Enable() // Add effect texture to blend-two-image custom shader TextureSet textureSet = mActorForBlending.GetRendererAt(0).GetTextures(); - textureSet.SetImage( 1u, mInputImage ); + TextureSetImage( textureSet, 1u, mInputImage ); SetupCamera(); CreateRenderTasks(); diff --git a/dali-toolkit/internal/filters/emboss-filter.cpp b/dali-toolkit/internal/filters/emboss-filter.cpp index c96d1bc..275292c 100644 --- a/dali-toolkit/internal/filters/emboss-filter.cpp +++ b/dali-toolkit/internal/filters/emboss-filter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -24,7 +24,10 @@ #include #include #include +#include #include + +// INTERNAL INCLUDES #include namespace Dali @@ -128,12 +131,12 @@ void EmbossFilter::Enable() InitializeControlRenderer( mActorForComposite, mRendererForEmboss2, rendererMap ); TextureSet textureSet1 = TextureSet::New(); - textureSet1.SetImage( 0, mImageForEmboss1 ); + TextureSetImage( textureSet1, 0, mImageForEmboss1 ); mActorForComposite.GetRendererAt(0).SetTextures( textureSet1 ); mActorForComposite.GetRendererAt(0).RegisterProperty( COLOR_UNIFORM_NAME, Color::BLACK ); TextureSet textureSet2 = TextureSet::New(); - textureSet2.SetImage( 0, mImageForEmboss2 ); + TextureSetImage( textureSet2, 0, mImageForEmboss2 ); mActorForComposite.GetRendererAt(1).SetTextures( textureSet2 ); mActorForComposite.GetRendererAt(1).RegisterProperty( COLOR_UNIFORM_NAME, Color::WHITE ); diff --git a/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas.cpp b/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas.cpp index 360cedf..d9c0a7c 100644 --- a/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas.cpp +++ b/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas.cpp @@ -19,6 +19,7 @@ #include // EXTERNAL INCLUDES +#include #include namespace @@ -78,7 +79,7 @@ VectorBlobAtlas::VectorBlobAtlas( unsigned int textureWidth, mAtlasTexture = BufferImage::New( textureWidth, textureHeight, Pixel::RGBA8888 ); mTextureSet = TextureSet::New(); - mTextureSet.SetImage( 0, mAtlasTexture ); + TextureSetImage( mTextureSet, 0, mAtlasTexture ); } bool VectorBlobAtlas::IsFull() const diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp index 3c9b450..605e5b1 100644 --- a/dali-toolkit/internal/text/text-scroller.cpp +++ b/dali-toolkit/internal/text/text-scroller.cpp @@ -19,6 +19,7 @@ #include // EXTERNAL INCLUDES +#include #include #include #include @@ -171,7 +172,7 @@ void CreateRenderer( FrameBufferImage frameBufferImage, Dali::Renderer& renderer sampler.SetFilterMode(FilterMode::NEAREST, FilterMode::NEAREST ); TextureSet textureSet = TextureSet::New(); - textureSet.SetImage( 0u, frameBufferImage ); + TextureSetImage( textureSet, 0u, frameBufferImage ); textureSet.SetSampler( 0u, sampler ); Geometry meshGeometry; diff --git a/plugins/dali-script-v8/src/rendering/texture-set-api.cpp b/plugins/dali-script-v8/src/rendering/texture-set-api.cpp index 1c5ad39..d89807f 100644 --- a/plugins/dali-script-v8/src/rendering/texture-set-api.cpp +++ b/plugins/dali-script-v8/src/rendering/texture-set-api.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -92,41 +92,6 @@ TextureSet TextureSetApi::New( const v8::FunctionCallbackInfo< v8::Value >& args return TextureSet::New(); } - -/** - * Sets the image to be used by a given texture - * @method setImage - * @for TextureSet - * @param {integer} index The index of the texture in the array of textures - * @param {Object} image The image used by this sampler - */ -void TextureSetApi::SetImage( const v8::FunctionCallbackInfo< v8::Value >& args ) -{ - v8::Isolate* isolate = args.GetIsolate(); - v8::HandleScope handleScope( isolate ); - - TextureSet textureSet = GetTextureSet( isolate, args ); - - bool found( false ); - int index = V8Utils::GetIntegerParameter( PARAMETER_0, found, isolate, args, 0 /* default */); - if( !found ) - { - DALI_SCRIPT_EXCEPTION( isolate, "invalid index parameter" ); - return; - } - - found = false; - Image image = V8Utils::GetImageParameter( PARAMETER_1, found, isolate, args ); - if( !found ) - { - DALI_SCRIPT_EXCEPTION( isolate, "missing image from param 1" ); - } - else - { - textureSet.SetImage(index, image); - } -} - /** * Set the sampler used by a given texture * @method setSampler -- 2.7.4