/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
// INTERNAL INCLUDES
#include <dali/public-api/object/type-registry.h>
-#include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
+#include <dali/internal/event/common/stage-impl.h>
#include <dali/internal/update/manager/update-manager.h>
#include <dali/internal/update/rendering/scene-graph-texture-set.h>
return textureSet;
}
-void TextureSet::SetTexture( size_t index, NewTexturePtr texture )
+void TextureSet::SetTexture( uint32_t index, TexturePtr texture )
{
- size_t textureCount( mNewTextures.size() );
+ uint32_t textureCount = static_cast<uint32_t>( mTextures.size() );
if( index >= textureCount )
{
- mNewTextures.resize(index + 1);
+ mTextures.resize(index + 1);
bool samplerExist = true;
if( mSamplers.size() < index + 1 )
samplerExist = false;
}
- for( size_t i(textureCount); i<=index; ++i )
+ for( uint32_t i(textureCount); i<=index; ++i )
{
- mNewTextures[i] = NULL;
+ mTextures[i] = NULL;
if( !samplerExist )
{
}
}
- mNewTextures[index]= texture;
+ mTextures[index]= texture;
- Render::NewTexture* renderTexture(0);
+ Render::Texture* renderTexture(0);
if( texture )
{
renderTexture = texture->GetRenderObject();
SceneGraph::SetTextureMessage( mEventThreadServices, *mSceneObject, index, renderTexture );
}
-NewTexture* TextureSet::GetTexture( size_t index ) const
+Texture* TextureSet::GetTexture( uint32_t index ) const
{
- NewTexture* result(0);
- if( index < mNewTextures.size() )
+ Texture* result(0);
+ if( index < mTextures.size() )
{
- result = mNewTextures[index].Get();
+ result = mTextures[index].Get();
}
else
{
return result;
}
-void TextureSet::SetSampler( size_t index, SamplerPtr sampler )
+void TextureSet::SetSampler( uint32_t index, SamplerPtr sampler )
{
- size_t samplerCount( mSamplers.size() );
+ uint32_t samplerCount = static_cast<uint32_t>( mSamplers.size() );
if( samplerCount < index + 1 )
{
mSamplers.resize( index + 1 );
- for( size_t i(samplerCount); i<=index; ++i )
+ for( uint32_t i = samplerCount; i<=index; ++i )
{
mSamplers[i] = NULL;
}
SceneGraph::SetSamplerMessage( mEventThreadServices, *mSceneObject, index, renderSampler );
}
-Sampler* TextureSet::GetSampler( size_t index ) const
+Sampler* TextureSet::GetSampler( uint32_t index ) const
{
Sampler* result(0);
if( index < mSamplers.size() )
return result;
}
-size_t TextureSet::GetTextureCount() const
+uint32_t TextureSet::GetTextureCount() const
{
- return mNewTextures.size();
+ return static_cast<uint32_t>( mTextures.size() );
}
const SceneGraph::TextureSet* TextureSet::GetTextureSetSceneObject() const
SceneGraph::UpdateManager& updateManager = mEventThreadServices.GetUpdateManager();
mSceneObject = SceneGraph::TextureSet::New();
- AddTextureSetMessage( updateManager, *mSceneObject );
+ OwnerPointer< SceneGraph::TextureSet > transferOwnership( mSceneObject );
+ AddTextureSetMessage( updateManager, transferOwnership );
}
TextureSet::~TextureSet()