ADD_DEFINITIONS("-DTRACE_ENABLED")
ENDIF()
-# Platforms with highp shader support can use vector based text
-IF( "${PROFILE}" STREQUAL "UBUNTU" )
- SET( ENABLE_VECTOR_BASED_TEXT_RENDERING 1 )
-ENDIF()
-
# Set paths
SET( toolkit_images_dir ${ROOT_SRC_DIR}/dali-toolkit/styles/images-common )
SET( toolkit_sounds_dir ${ROOT_SRC_DIR}/dali-toolkit/sounds )
INCLUDE( ${ROOT_SRC_DIR}/dali-toolkit/third-party/file.list )
INCLUDE( ${ROOT_SRC_DIR}/doc/file.list )
+# Platforms with highp shader support can use vector based text
+IF( ENABLE_VECTOR_BASED_TEXT_RENDERING )
+ INCLUDE( ${ROOT_SRC_DIR}/dali-toolkit/internal/text/rendering/vector-based/file.list )
+ENDIF()
+
SET(LIBTYPE SHARED)
IF(DEFINED STATIC)
SET(LIBTYPE STATIC)
/*
- * 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.
mImpl->mActor = Actor::New();
mImpl->mActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
- mImpl->mActor.SetProperty( Actor::Property::SIZE, Vector2( view.GetControlSize() );
+ mImpl->mActor.SetProperty( Actor::Property::SIZE, Vector2( view.GetControlSize() ) );
mImpl->mActor.SetProperty( Actor::Property::COLOR, Color::WHITE );
#if defined(DEBUG_ENABLED)
mImpl->mActor.SetProperty( Dali::Actor::Property::NAME, "Text renderable actor" );
/*
- * 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.
#include <dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas.h>
// EXTERNAL INCLUDES
-#include <dali/devel-api/images/texture-set-image.h>
#include <dali/integration-api/debug.h>
namespace
{
DALI_LOG_INFO( gLogFilter, Debug::General, "Blob atlas %p size %dx%d, item width %d, height quantum %d\n", this, textureWidth, textureHeight, itemWidth, itemHeightQuantum );
- mAtlasTexture = BufferImage::New( textureWidth, textureHeight, Pixel::RGBA8888 );
+ mAtlasTexture = Texture::New( TextureType::TEXTURE_2D, Pixel::RGBA8888, textureWidth, textureHeight );
mTextureSet = TextureSet::New();
- TextureSetImage( mTextureSet, 0, mAtlasTexture );
+ mTextureSet.SetTexture(0, mAtlasTexture);
}
bool VectorBlobAtlas::IsFull() const
unsigned int height,
VectorBlob* blob )
{
- PixelBuffer* pixbuf = mAtlasTexture.GetBuffer();
+ const size_t size = width * height * 4;
+ uint8_t* pixbuf = new uint8_t[size];
+
size_t pos;
size_t dataIndex = 0;
- for( size_t y= offsetY; y< height + offsetY; y++ )
+ for( size_t y = 0; y < height; y++ )
{
pos = y * mTextureWidth * 4;
- for( size_t x = offsetX; x < width + offsetX; x++ )
+ for( size_t x = 0; x < width; x++ )
{
pixbuf[pos+x*4] = 0xFF & blob[dataIndex].r;
pixbuf[pos+x*4+1] = 0xFF & blob[dataIndex].g;
}
}
- mAtlasTexture.Update();
+ PixelData pixelData = PixelData::New(pixbuf, size, width, height, Pixel::RGBA8888, PixelData::DELETE_ARRAY);
+ mAtlasTexture.Upload(pixelData, 0u, 0u, offsetX, offsetY, width, height);
}
} // namespace Text
#define DALI_TOOLKIT_TEXT_VECTOR_BLOB_ATLAS_H
/*
- * 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.
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/images/buffer-image.h>
#include <dali/public-api/object/ref-object.h>
#include <dali/public-api/rendering/shader.h>
+#include <dali/public-api/rendering/texture.h>
#include <dali/public-api/rendering/texture-set.h>
#include <dali/devel-api/text-abstraction/text-abstraction-definitions.h>
unsigned int mCursorX;
unsigned int mCursorY;
- BufferImage mAtlasTexture;
+ Texture mAtlasTexture;
TextureSet mTextureSet;