utc-Dali-Any.cpp
utc-Dali-Atlas.cpp
utc-Dali-BaseHandle.cpp
- utc-Dali-BitmapImage.cpp
+ utc-Dali-BufferImage.cpp
utc-Dali-CameraActor.cpp
- utc-Dali-Character.cpp
utc-Dali-Constraint.cpp
utc-Dali-Context.cpp
utc-Dali-CustomActor.cpp
utc-Dali-DynamicsWorld.cpp
utc-Dali-DynamicsWorldConfig.cpp
utc-Dali-EncodedBufferImage.cpp
- utc-Dali-Font.cpp
- utc-Dali-FontParameters.cpp
+ utc-Dali-FixedSizeMemoryPool.cpp
utc-Dali-FrameBufferImage.cpp
utc-Dali-Gesture.cpp
utc-Dali-GestureDetector.cpp
{
TestApplication application;
- BitmapImage img = BitmapImage::New( 1,1 );
+ BufferImage img = BufferImage::New( 1,1 );
ImageActor actor = ImageActor::New( img );
- ShaderEffect effect = ShaderEffect::New( " ", " ", " ", " ", ShaderEffect::HINT_GRID );
+ ShaderEffect effect = ShaderEffect::New( " ", " ", GEOMETRY_TYPE_IMAGE, ShaderEffect::HINT_GRID );
actor.SetShaderEffect( effect );
const float INVALID_SIZE = float(1u<<31);
bool& mSignalVerified;
};
- struct TestModelCallback
++
+ struct TestTextActorCallback
{
- TestModelCallback(bool& signalReceived)
+ TestTextActorCallback(bool& signalReceived)
: mSignalVerified(signalReceived)
{
}
END_TEST;
}
- int UtcDaliObjectRegistrySignalModelCreated(void)
- {
- TestApplication application;
- ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-
- bool verified = false;
- TestModelCallback test(verified);
-
- Dali::RefObject* objectPointer = NULL;
- TestObjectDestroyedCallback test2(verified, objectPointer);
-
- registry.ObjectCreatedSignal().Connect(&application, test);
- registry.ObjectDestroyedSignal().Connect(&application, test2);
-
- {
- Model model = Model::New("blah");
- DALI_TEST_CHECK( test.mSignalVerified );
-
- verified = false;
- objectPointer = model.GetObjectPtr();
- }
- DALI_TEST_CHECK( test.mSignalVerified );
- END_TEST;
- }
-int UtcDaliObjectRegistrySignalTextActorCreated(void)
-{
- TestApplication application;
- ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
-
- bool verified = false;
- TestTextActorCallback test(verified);
-
- Dali::RefObject* objectPointer = NULL;
- TestObjectDestroyedCallback test2(verified, objectPointer);
-
- registry.ObjectCreatedSignal().Connect(&application, test);
- registry.ObjectDestroyedSignal().Connect(&application, test2);
-
- {
- TextActor actor = TextActor::New("Hello");
- DALI_TEST_CHECK( test.mSignalVerified );
-
- verified = false;
- objectPointer = actor.GetObjectPtr();
- }
- DALI_TEST_CHECK( test.mSignalVerified );
- END_TEST;
-}
-
int UtcDaliObjectRegistrySignalAnimationCreated(void)
{
TestApplication application;
* create a tree
* actor1
* actor2 actor4
- * actor3 textactor
- * imageactor
+ * actor3 imageactor1
+ * imageactor2
*/
- BitmapImage img = BitmapImage::New( 1,1 );
+ BufferImage img = BufferImage::New( 1,1 );
ImageActor actor1 = ImageActor::New( img );
Actor actor2 = Actor::New();
actor1.Add( actor2 );
{
Actor actor = Actor::New();
Actor child = ImageActor::New();
- Actor grandChild = LightActor::New();
- Actor grandChild = TextActor::New();
-
actor.Add( child );
-- child.Add( grandChild );
Stage::GetCurrent().Add( actor );
application.SendNotification();
DALI_TEST_CHECK( childValue.HasKey( "type" ) );
DALI_TEST_EQUALS( childValue.GetValue( "type" ).Get< std::string >(), "ImageActor", TEST_LOCATION );
-- DALI_TEST_CHECK( childValue.HasKey( "actors" ) );
-- Property::Array grandChildren( childValue.GetValue( "actors").Get< Property::Array >() );
-- DALI_TEST_CHECK( grandChildren.size() == 1u );
--
-- Property::Map grandChildMap( grandChildren[0].Get< Property::Map >() );
-- DALI_TEST_CHECK( !grandChildMap.Empty() );
-- Property::Value grandChildValue( grandChildMap );
-- DALI_TEST_CHECK( grandChildValue.HasKey( "type" ) );
- DALI_TEST_EQUALS( grandChildValue.GetValue( "type" ).Get< std::string >(), "LightActor", TEST_LOCATION );
- DALI_TEST_EQUALS( grandChildValue.GetValue( "type" ).Get< std::string >(), "TextActor", TEST_LOCATION );
-
--
Stage::GetCurrent().Remove( actor );
}
END_TEST;
ResourceNativeImage,
ResourceTargetImage,
ResourceShader,
- ResourceModel,
- ResourceMesh,
- ResourceText
+ ResourceMesh
};
/**
};
/**
- * ModelResourceType describes a model resource, which can be requested
- * from PlatformAbstraction::LoadResource()
- * TextResourceType describes a font resource, which can be requested.
- * from PlatformAbstraction::LoadResource() No font atlas is created.
-- */
- struct ModelResourceType : public ResourceType
-struct TextResourceType : public ResourceType
--{
-- /**
- * Constructor.
- * Text quality enum
-- */
- ModelResourceType()
- : ResourceType(ResourceModel)
- enum TextQuality
- {
- TextQualityLow, ///< Request lower quality text
- TextQualityHigh ///< Request higher quality text
- };
-
- /**
- * Structure for requesting character to be loaded from file with atlas position
- * for automatic texture upload
- */
- struct GlyphPosition
- {
- GlyphPosition(unsigned int chr, unsigned int xPos, unsigned int yPos)
- : character(chr),
- quality(0),
- loaded(0),
- xPosition(xPos),
- yPosition(yPos)
- {
- }
-
- /** \addtogroup GlyphPositionPackedWord
- * We have 32 bits available for this data because of the alignment restrictions
- * on the 32 bit words that follow so rather than using the minimum number of
- * bits for each, we give "loaded" a whole 8 bits and push it to a byte-aligned
- * address to make access possible via a plain byte load instead of a load,
- * mask, shift sequence. The naive bitwidths before this modification are as follows:
- * character:21;
- * quality:1;
- * loaded:1;
- * @{
- */
- uint32_t character:21; ///< character code (UTF-32), max value of 0x10ffff (21 bits)
- uint32_t quality:3; ///< Loaded quality 0 = low quality, 1 = high quality
- uint32_t loaded:8; ///< true if Loaded
- /** @}*/
-
- uint32_t xPosition; ///< X Position in atlas
- uint32_t yPosition; ///< Y Position in atlas
-
- /**
- * Used by ResourceTypeCompare
- */
- friend bool operator==(const GlyphPosition& lhs, const GlyphPosition& rhs);
- };
-
- typedef std::vector< GlyphPosition > CharacterList; ///< List of glyphs requested
-
- enum GlyphCacheMode
- {
- GLYPH_CACHE_READ, ///< Doesn't cache glyphs.
- GLYPH_CACHE_WRITE, ///< Caches glyphs.
- };
-
- /**
- * Text resource type constructor
- * @param [in] hash The resourceHash for the FontAtlas and FontMetrics
- * @param [in] style The font style
- * @param [in] characterList The requested text as a vector or UTF-32 codes
- * @param [in] textureAtlasId The resource ID of the texture atlas
- * @param [in] quality A boolean, set to true to request high quality glyph bitmaps.
- * @param [in] maxGlyphSize The size of the largest glyph in the font.
- * @param [in] cache Whether text glyph should be cached or not.
- */
- TextResourceType( const size_t hash,
- const std::string& style,
- const CharacterList& characterList,
- ResourceId textureAtlasId,
- TextQuality quality = TextQualityLow,
- Vector2 maxGlyphSize = Vector2::ONE,
- GlyphCacheMode cache = GLYPH_CACHE_READ )
- : ResourceType(ResourceText),
- mFontHash(hash),
- mStyle(style),
- mCharacterList(characterList),
- mTextureAtlasId(textureAtlasId),
- mQuality(quality),
- mMaxGlyphSize(maxGlyphSize),
- mCache( cache )
-- {
-- }
--
-- /**
- * Destructor.
- * virtual destructor
-- */
- virtual ~ModelResourceType()
- virtual ~TextResourceType()
-- {
-- }
--
-- /**
-- * @copydoc ResourceType::Clone
-- */
-- virtual ResourceType* Clone() const
-- {
- return new ModelResourceType();
- return new TextResourceType(mFontHash, mStyle, mCharacterList, mTextureAtlasId, mQuality, mMaxGlyphSize, mCache);
-- }
-
- /**
- * Font resource hash.
- */
- const size_t mFontHash;
-
- /**
- * Font style.
- */
- const std::string mStyle;
-
- /**
- * Displayed text (UTF-32 codes)
- */
-
- CharacterList mCharacterList; ///< List of characters
-
- ResourceId mTextureAtlasId; ///< Resource ID of the texture atlas this request is for
-
- TextQuality mQuality; ///< Text quality setting
-
- Vector2 mMaxGlyphSize; ///< Max glyph size for font
-
- GlyphCacheMode mCache; ///< Whether text glyphs should be cached.
--
--private:
--
-- // Undefined copy constructor.
- ModelResourceType(const ModelResourceType& typePath);
- TextResourceType(const TextResourceType& typePath);
--
- // Undefined assignment operator.
- ModelResourceType& operator=(const ModelResourceType& rhs);
- // Undefined copy constructor.
- TextResourceType& operator=(const TextResourceType& rhs);
--};
--
--
--/**
* MeshResourceType describes a mesh program resource, which can be created
* using ResourceManager::AllocateMesh.
*/
#include <dali/internal/update/common/discard-queue.h>
#include <dali/internal/common/event-to-update.h>
#include <dali/internal/update/resources/resource-manager.h>
-#include <dali/internal/event/text/font-factory.h>
#include <dali/internal/event/images/image-factory.h>
- #include <dali/internal/event/modeling/model-factory.h>
-#include <dali/internal/event/images/emoji-factory.h>
#include <dali/internal/event/common/thread-local-storage.h>
#include <dali/internal/event/effects/shader-factory.h>
#include <dali/internal/update/touch/touch-resampler.h>
mDiscardQueue(NULL),
mResourcePostProcessQueue(),
mNotificationManager(NULL),
- mFontFactory(NULL),
mImageFactory(NULL),
- mModelFactory(NULL),
mShaderFactory(NULL),
- mEmojiFactory(NULL),
mIsActive(true),
mProcessingEvent(false)
{
mGestureEventProcessor = new GestureEventProcessor(*mStage, gestureManager, mRenderController);
mEventProcessor = new EventProcessor(*mStage, *mNotificationManager, *mGestureEventProcessor);
- mFontFactory = new FontFactory(*mResourceClient);
mImageFactory = new ImageFactory( *mResourceClient );
- mModelFactory = new ModelFactory(*mResourceClient);
mShaderFactory = new ShaderFactory(*mResourceClient);
mShaderFactory->LoadDefaultShaders();
- mEmojiFactory = new EmojiFactory();
GetImplementation(Dali::TypeRegistry::Get()).CallInitFunctions();
}
delete mEventProcessor;
delete mGestureEventProcessor;
delete mNotificationManager;
- delete mFontFactory;
delete mImageFactory;
- delete mModelFactory;
delete mShaderFactory;
delete mResourceClient;
delete mResourceManager;
class GestureEventProcessor;
class ResourceClient;
class ResourceManager;
-class FontFactory;
class ImageFactory;
- class ModelFactory;
class ShaderFactory;
class TouchResampler;
-class EmojiFactory;
namespace SceneGraph
{
NotificationManager* mNotificationManager; ///< Notification manager
AnimationPlaylistOwner mAnimationPlaylist; ///< For 'Fire and forget' animation support
OwnerPointer<PropertyNotificationManager> mPropertyNotificationManager; ///< For safe signal emmision of property changed notifications
- FontFactory* mFontFactory; ///< font resource factory
ImageFactory* mImageFactory; ///< Image resource factory
- ModelFactory* mModelFactory; ///< Model resource factory
ShaderFactory* mShaderFactory; ///< Shader resource factory
ResourceClient* mResourceClient; ///< Asynchronous Resource Loading
ResourceManager* mResourceManager; ///< Asynchronous Resource Loading
class ActorAttachment;
class CameraAttachment;
class ImageAttachment;
- class LightAttachment;
-class TextAttachment;
class MeshAttachment;
typedef IntrusivePtr<ActorAttachment> ActorAttachmentPtr;
typedef IntrusivePtr<CameraAttachment> CameraAttachmentPtr;
typedef IntrusivePtr<ImageAttachment> ImageAttachmentPtr;
- typedef IntrusivePtr<LightAttachment> LightAttachmentPtr;
typedef IntrusivePtr<MeshAttachment> MeshAttachmentPtr;
-typedef IntrusivePtr<TextAttachment> TextAttachmentPtr;
} // namespace Internal
class CustomActor;
class ImageActor;
class Layer;
- class LightActor;
class MeshActor;
-class TextActor;
typedef IntrusivePtr<Actor> ActorPtr;
typedef IntrusivePtr<CameraActor> CameraActorPtr;
typedef IntrusivePtr<CustomActor> CustomActorPtr;
typedef IntrusivePtr<ImageActor> ImageActorPtr;
typedef IntrusivePtr<Layer> LayerPtr;
- typedef IntrusivePtr<LightActor> LightActorPtr;
typedef IntrusivePtr<MeshActor> MeshActorPtr;
-typedef IntrusivePtr<TextActor> TextActorPtr;
} // namespace Internal
return mCore->GetImageFactory();
}
- ModelFactory& ThreadLocalStorage::GetModelFactory()
-FontFactory& ThreadLocalStorage::GetFontFactory()
--{
- return mCore->GetModelFactory();
- return mCore->GetFontFactory();
--}
--
ShaderFactory& ThreadLocalStorage::GetShaderFactory()
{
return mCore->GetShaderFactory();
class ResourceClient;
class ResourceManager;
class ImageFactory;
- class ModelFactory;
-class FontFactory;
class ShaderFactory;
class EventToUpdate;
class GestureEventProcessor;
ImageFactory& GetImageFactory();
/**
- * Returns the Model Factory
- * @return reference to the Image Factory
- * Returns the Font Factory
- * @return reference to the Font Factory
-- */
- ModelFactory& GetModelFactory();
- FontFactory& GetFontFactory();
--
-- /**
* Returns the Shader Factory
* @return reference to the Shader Factory
*/
mDefaultShader->SendProgramMessage( GEOMETRY_TYPE_IMAGE, SHADER_DEFAULT, ImageVertex, ImageFragment, false );
- mDefaultShader->SendProgramMessage( GEOMETRY_TYPE_TEXT, SHADER_DEFAULT, TextDistanceFieldVertex, TextDistanceFieldFragment, false );
-
- mDefaultShader->SendProgramMessage( GEOMETRY_TYPE_TEXT, SHADER_GRADIENT,
- std::string( SHADER_DEF_USE_GRADIENT ) + TextDistanceFieldVertex,
- std::string( SHADER_DEF_USE_GRADIENT ) + TextDistanceFieldFragment,
- false );
-
- mDefaultShader->SendProgramMessage( GEOMETRY_TYPE_TEXT, SHADER_GRADIENT_GLOW, TextDistanceFieldGlowVertex, TextDistanceFieldGlowFragment, false );
-
- mDefaultShader->SendProgramMessage( GEOMETRY_TYPE_TEXT, SHADER_GRADIENT_SHADOW, TextDistanceFieldShadowVertex, TextDistanceFieldShadowFragment, false );
-
- mDefaultShader->SendProgramMessage( GEOMETRY_TYPE_TEXT, SHADER_GRADIENT_OUTLINE, TextDistanceFieldOutlineVertex, TextDistanceFieldOutlineFragment, false );
-
- mDefaultShader->SendProgramMessage( GEOMETRY_TYPE_TEXT, SHADER_GRADIENT_OUTLINE_GLOW, TextDistanceFieldOutlineGlowVertex, TextDistanceFieldOutlineGlowFragment, false );
-
// Untextured meshes
- mDefaultShader->SendProgramMessage( GEOMETRY_TYPE_UNTEXTURED_MESH, SHADER_DEFAULT,
- UntexturedMeshVertex,
- std::string( SHADER_DEF_USE_LIGHTING ) + UntexturedMeshFragment,
- false );
-
mDefaultShader->SendProgramMessage( GEOMETRY_TYPE_UNTEXTURED_MESH, SHADER_EVENLY_LIT,
UntexturedMeshVertex,
UntexturedMeshFragment,
*/
// INTERNAL INCLUDES
++#include <dali/integration-api/bitmap.h> // For Integration::BitmapPtr
#include <dali/public-api/object/ref-object.h>
--#include <dali/internal/event/images/image-impl.h>
-#include <dali/public-api/images/image.h>
+ #include <dali/public-api/images/buffer-image.h>
+#include <dali/public-api/images/image.h>
- #include <dali/public-api/images/bitmap-image.h>
- #include <dali/integration-api/bitmap.h> // For Integration::BitmapPtr
++#include <dali/internal/event/images/image-impl.h>
namespace Dali
{
* @param [in] stride the internal stride of the pixelbuffer in pixels
* @param [in] releasePol optionally relase memory when image is not visible on screen (default: keep image data until Image object is alive).
*/
- static BitmapImagePtr New( PixelBuffer* pixBuf,
- static BufferImagePtr New( PixelBuffer* pixBuf,
++ static BufferImagePtr New( Integration::PixelBuffer* pixBuf,
unsigned int width,
unsigned int height,
Pixel::Format pixelformat,
* @param [in] stride the internal stride of the pixelbuffer in pixels
* @param [in] releasePol optionally relase memory when image is not visible on screen (default: keep image data until Image object is alive).
*/
- BitmapImage(PixelBuffer* pixBuf,
- BufferImage(PixelBuffer* pixBuf,
++ BufferImage(Integration::PixelBuffer* pixBuf,
unsigned int width,
unsigned int height,
Pixel::Format pixelformat,
/**
* Returns the pixel buffer of the Image.
* The application developer can write to the buffer.
- * Upload the modified contents with BufferUpdated.
+ * Upload the modified contents with Update().
* @return the pixel buffer
*/
-- PixelBuffer* GetBuffer();
++ Integration::PixelBuffer* GetBuffer();
/**
* Returns buffer size in bytes.
break;
}
- case ResourceModel:
- {
- break; // result = 0
- }
- case ResourceText:
- {
- // compare text requests
- const TextResourceType& lhsText = static_cast<const TextResourceType&>(lhs);
- const TextResourceType& rhsText = static_cast<const TextResourceType&>(rhs);
-
- if( lhsText.mStyle != rhsText.mStyle )
- {
- result = lhsText.mStyle < rhsText.mStyle ? -1 : 1;
- }
- else if (lhsText.mCharacterList.size() != rhsText.mCharacterList.size())
- {
- result = lhsText.mCharacterList.size() < rhsText.mCharacterList.size() ? -1 : 1;
- }
- else if (!std::equal(lhsText.mCharacterList.begin(), lhsText.mCharacterList.end(), rhsText.mCharacterList.begin()))
- {
- for (unsigned int i = 0; i < lhsText.mCharacterList.size(); ++i)
- {
- if (lhsText.mCharacterList[i].character != rhsText.mCharacterList[i].character)
- {
- result = lhsText.mCharacterList[i].character <= rhsText.mCharacterList[i].character ? -1 : 1;
- break;
- }
- }
- }
- else if (lhsText.mFontHash != rhsText.mFontHash)
- {
- result = lhsText.mFontHash < rhsText.mFontHash ? -1 : 1;
- }
- else if (lhsText.mQuality != rhsText.mQuality)
- {
- result = lhsText.mQuality < rhsText.mQuality ? -1 : 1;
- }
- break;
- }
-
case ResourceMesh:
{
break; // result = 0
$(internal_src_dir)/event/actor-attachments/actor-attachment-impl.cpp \
$(internal_src_dir)/event/actor-attachments/camera-attachment-impl.cpp \
$(internal_src_dir)/event/actor-attachments/image-attachment-impl.cpp \
- $(internal_src_dir)/event/actor-attachments/light-attachment-impl.cpp \
$(internal_src_dir)/event/actor-attachments/mesh-attachment-impl.cpp \
$(internal_src_dir)/event/actor-attachments/renderable-attachment-impl.cpp \
- $(internal_src_dir)/event/actor-attachments/text-attachment-impl.cpp \
$(internal_src_dir)/event/actors/actor-impl.cpp \
$(internal_src_dir)/event/actors/custom-actor-internal.cpp \
$(internal_src_dir)/event/actors/image-actor-impl.cpp \
$(internal_src_dir)/event/actors/layer-impl.cpp \
$(internal_src_dir)/event/actors/layer-list.cpp \
- $(internal_src_dir)/event/actors/text-actor-impl.cpp \
$(internal_src_dir)/event/actors/mesh-actor-impl.cpp \
$(internal_src_dir)/event/actors/camera-actor-impl.cpp \
- $(internal_src_dir)/event/actors/light-actor-impl.cpp \
- $(internal_src_dir)/event/actors/model-actor-factory-impl.cpp \
$(internal_src_dir)/event/actors/renderable-actor-impl.cpp \
$(internal_src_dir)/event/animation/active-constraint-base.cpp \
$(internal_src_dir)/event/animation/animation-impl.cpp \
$(internal_src_dir)/update/node-attachments/node-attachment.cpp \
$(internal_src_dir)/update/node-attachments/scene-graph-camera-attachment.cpp \
$(internal_src_dir)/update/node-attachments/scene-graph-image-attachment.cpp \
- $(internal_src_dir)/update/node-attachments/scene-graph-light-attachment.cpp \
$(internal_src_dir)/update/node-attachments/scene-graph-mesh-attachment.cpp \
$(internal_src_dir)/update/node-attachments/scene-graph-renderable-attachment.cpp \
- $(internal_src_dir)/update/node-attachments/scene-graph-text-attachment.cpp \
$(internal_src_dir)/update/nodes/node.cpp \
$(internal_src_dir)/update/nodes/node-messages.cpp \
$(internal_src_dir)/update/nodes/scene-graph-layer.cpp \
}
}
-void ResourceManager::HandleAtlasUpdateRequest( ResourceId id, ResourceId atlasId, LoadStatus loadStatus )
-{
- mImpl->atlasStatus.Update(id, atlasId, loadStatus );
-}
-
-
/********************************************************************************
- ******************** Event thread object direct interface *********************
- ********************************************************************************/
-
- ModelDataPtr ResourceManager::GetModelData(ResourceId id)
- {
- ModelDataPtr modelData;
- ModelCacheIter iter = mImpl->mModels.find(id);
- if(iter != mImpl->mModels.end())
- {
- modelData = iter->second;
- }
- return modelData;
- }
-
- /********************************************************************************
******************** Update thread object direct interface ********************
********************************************************************************/
#include <dali/internal/common/event-to-update.h>
#include <dali/internal/common/message.h>
#include <dali/internal/event/common/thread-local-storage.h>
- #include <dali/internal/event/modeling/model-data-impl.h>
-#include <dali/internal/common/bitmap-upload.h>
-#include <dali/internal/event/text/font-impl.h>
#include <dali/internal/event/resources/resource-client-declarations.h>
#include <dali/internal/event/effects/shader-factory.h>
#include <dali/internal/update/modeling/internal-mesh-data.h>
*/
void HandleDiscardResourceRequest( ResourceId id, Integration::ResourceTypeId typeId );
- /**
- * Update font texture atlas status
- * @param[in] id The resource id
- * @param[in] atlasId texture ID of the atlas
- * @param[in] loadStatus The status update.
- */
- void HandleAtlasUpdateRequest( ResourceId id, ResourceId atlasId, Integration::LoadStatus loadStatus );
-
/********************************************************************************
- ******************** Event thread object direct interface *********************
- ********************************************************************************/
-
- /**
- * Called by model implementations which require access to the model
- * data.
- * @note Only called from event thread objects - ModelData is not used
- * by update objects.
- * @param[in] id - the id of a ModelData resource.
- * @return the model data or NULL if it has not been loaded.
- */
- Internal::ModelDataPtr GetModelData(ResourceId id);
-
- /********************************************************************************
******************** Update thread object direct interface ********************
********************************************************************************/
#include <dali/public-api/actors/mesh-actor.h>
// INTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
#include <dali/internal/event/actors/mesh-actor-impl.h>
- #include <dali/internal/event/modeling/model-impl.h>
#include <dali/internal/event/modeling/mesh-impl.h>
#include <dali/internal/event/modeling/animatable-mesh-impl.h>
#include <dali/public-api/actors/draw-mode.h>
#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/actors/layer.h>
- #include <dali/public-api/actors/light-actor.h>
#include <dali/public-api/actors/mesh-actor.h>
- #include <dali/public-api/actors/model-actor-factory.h>
#include <dali/public-api/actors/renderable-actor.h>
-#include <dali/public-api/actors/text-actor.h>
#include <dali/public-api/actors/sampling.h>
#include <dali/public-api/animation/active-constraint-declarations.h>
$(public_api_src_dir)/actors/custom-actor-impl.cpp \
$(public_api_src_dir)/actors/image-actor.cpp \
$(public_api_src_dir)/actors/layer.cpp \
- $(public_api_src_dir)/actors/light-actor.cpp \
- $(public_api_src_dir)/actors/model-actor-factory.cpp \
$(public_api_src_dir)/actors/mesh-actor.cpp \
- $(public_api_src_dir)/actors/text-actor.cpp \
$(public_api_src_dir)/actors/renderable-actor.cpp \
$(public_api_src_dir)/animation/active-constraint.cpp \
$(public_api_src_dir)/animation/animation.cpp \
$(public_api_src_dir)/actors/draw-mode.h \
$(public_api_src_dir)/actors/image-actor.h \
$(public_api_src_dir)/actors/layer.h \
- $(public_api_src_dir)/actors/light-actor.h \
$(public_api_src_dir)/actors/mesh-actor.h \
- $(public_api_src_dir)/actors/model-actor-factory.h \
- $(public_api_src_dir)/actors/text-actor.h \
$(public_api_src_dir)/actors/renderable-actor.h \
$(public_api_src_dir)/actors/sampling.h
projects / platform / core / uifw / dali-core.git / commitdiff