projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Const correctness improvements for Property::Value." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
image-atlas-manager.cpp
diff --git
a/dali-toolkit/internal/visuals/image-atlas-manager.cpp
b/dali-toolkit/internal/visuals/image-atlas-manager.cpp
index
9697e50
..
a9a4786
100644
(file)
--- a/
dali-toolkit/internal/visuals/image-atlas-manager.cpp
+++ b/
dali-toolkit/internal/visuals/image-atlas-manager.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
16
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-19,8
+19,7
@@
#include "image-atlas-manager.h"
// EXTERNAL HEADER
#include "image-atlas-manager.h"
// EXTERNAL HEADER
-#include <dali/devel-api/images/texture-set-image.h>
-#include <dali/public-api/images/resource-image.h>
+#include <dali/devel-api/adaptor-framework/image-loading.h>
namespace Dali
{
namespace Dali
{
@@
-49,15
+48,16
@@
ImageAtlasManager::~ImageAtlasManager()
TextureSet ImageAtlasManager::Add( Vector4& textureRect,
const std::string& url,
TextureSet ImageAtlasManager::Add( Vector4& textureRect,
const std::string& url,
- ImageDimensions size,
+ ImageDimensions
&
size,
FittingMode::Type fittingMode,
FittingMode::Type fittingMode,
- bool orientationCorrection )
+ bool orientationCorrection,
+ AtlasUploadObserver* atlasUploadObserver )
{
ImageDimensions dimensions = size;
ImageDimensions zero;
if( size == zero )
{
{
ImageDimensions dimensions = size;
ImageDimensions zero;
if( size == zero )
{
- dimensions =
ResourceImage::Ge
tImageSize( url );
+ dimensions =
Dali::GetCloses
tImageSize( url );
}
// big image, atlasing is not applied
}
// big image, atlasing is not applied
@@
-67,11
+67,12
@@
TextureSet ImageAtlasManager::Add( Vector4& textureRect,
{
return TextureSet();
}
{
return TextureSet();
}
+ size = dimensions;
unsigned int i = 0;
for( AtlasContainer::iterator iter = mAtlasList.begin(); iter != mAtlasList.end(); ++iter)
{
unsigned int i = 0;
for( AtlasContainer::iterator iter = mAtlasList.begin(); iter != mAtlasList.end(); ++iter)
{
- if( (*iter).Upload( textureRect, url, size, fittingMode, orientationCorrection ) )
+ if( (*iter).Upload( textureRect, url, size, fittingMode, orientationCorrection
, atlasUploadObserver
) )
{
return mTextureSetList[i];
}
{
return mTextureSetList[i];
}
@@
-79,12
+80,12
@@
TextureSet ImageAtlasManager::Add( Vector4& textureRect,
}
CreateNewAtlas();
}
CreateNewAtlas();
- mAtlasList.back().Upload( textureRect, url, size, fittingMode, orientationCorrection );
+ mAtlasList.back().Upload( textureRect, url, size, fittingMode, orientationCorrection
, atlasUploadObserver
);
return mTextureSetList.back();
}
TextureSet ImageAtlasManager::Add( Vector4& textureRect,
return mTextureSetList.back();
}
TextureSet ImageAtlasManager::Add( Vector4& textureRect,
- PixelData pixelData )
+
PixelData pixelData )
{
// big buffer, atlasing is not applied
{
// big buffer, atlasing is not applied
@@
-142,7
+143,7
@@
void ImageAtlasManager::CreateNewAtlas()
}
mAtlasList.push_back( newAtlas );
TextureSet textureSet = TextureSet::New();
}
mAtlasList.push_back( newAtlas );
TextureSet textureSet = TextureSet::New();
-
TextureSetImage( textureSet,
0u, newAtlas.GetAtlas() );
+
textureSet.SetTexture(
0u, newAtlas.GetAtlas() );
mTextureSetList.push_back( textureSet );
}
mTextureSetList.push_back( textureSet );
}