/*
- * Copyright (c) 2019 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.
if ( signalData.createNewScene )
{
- TestRenderSurface* surface = new TestRenderSurface( PositionSize( 0.0f, 0.0f, 480.0f, 800.0f ) ); // This is a leak, but we need to keep the surface alive till the end
- Dali::Integration::Scene scene = Dali::Integration::Scene::New( *surface );
+ Dali::Integration::Scene scene = Dali::Integration::Scene::New( Size( 480.0f, 800.0f ) );
DALI_TEST_CHECK( scene );
signalData.newSceneCreated = true;
WheelEventSignalData& signalData;
};
+// Stores data that is populated in the KeyEventGeneratedSignal callback and will be read by the TET cases
+struct KeyEventGeneratedSignalData
+{
+ KeyEventGeneratedSignalData()
+ : functorCalled(false)
+ {}
+
+ void Reset()
+ {
+ functorCalled = false;
+
+ receivedKeyEvent.keyModifier = 0;
+ receivedKeyEvent.keyPressedName.clear();
+ receivedKeyEvent.keyPressed.clear();
+ }
+
+ bool functorCalled;
+ KeyEvent receivedKeyEvent;
+};
+
+// Functor that sets the data when called
+struct KeyEventGeneratedReceivedFunctor
+{
+ KeyEventGeneratedReceivedFunctor( KeyEventGeneratedSignalData& data )
+ : signalData( data )
+ {}
+
+ bool operator()( const KeyEvent& keyEvent )
+ {
+ signalData.functorCalled = true;
+ signalData.receivedKeyEvent = keyEvent;
+
+ return true;
+ }
+
+ bool operator()()
+ {
+ signalData.functorCalled = true;
+ return true;
+ }
+
+ KeyEventGeneratedSignalData& signalData;
+};
+
void GenerateTouch( TestApplication& application, PointState::Type state, const Vector2& screenPosition )
{
Integration::TouchEvent touchEvent;
Dali::Integration::Scene scene = application.GetScene();
Actor actor = Actor::New();
- DALI_TEST_CHECK( !actor.OnStage() );
+ DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
scene.Add( actor );
- DALI_TEST_CHECK( actor.OnStage() );
+ DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
END_TEST;
}
Dali::Integration::Scene scene = application.GetScene();
Actor actor = Actor::New();
- DALI_TEST_CHECK( !actor.OnStage() );
+ DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
scene.Add( actor );
- DALI_TEST_CHECK( actor.OnStage() );
+ DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
scene.Remove(actor);
- DALI_TEST_CHECK( !actor.OnStage() );
+ DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
END_TEST;
}
tet_infoline("Testing Dali::Scene::Discard");
// Create a new Scene
- TestRenderSurface surface( PositionSize( 0.0f, 0.0f, 480.0f, 800.0f ) );
- Dali::Integration::Scene scene = Dali::Integration::Scene::New( surface );
+ Dali::Integration::Scene scene = Dali::Integration::Scene::New( Size( 480.0f, 800.0f ) );
DALI_TEST_CHECK( scene );
// One reference of scene kept here and the other one kept in the Core
TestApplication application;
// Create a Scene
- TestRenderSurface surface( PositionSize( 0.0f, 0.0f, 480.0f, 800.0f ) );
- Dali::Integration::Scene scene = Dali::Integration::Scene::New( surface );
+ Dali::Integration::Scene scene = Dali::Integration::Scene::New( Size( 480.0f, 800.0f ) );
DALI_TEST_CHECK( scene );
// One reference of scene kept here and the other one kept in the Core
DALI_TEST_CHECK( rootLayer.GetBaseObject().ReferenceCount() == 1 );
// Create a new Scene while the root layer of the deleted scene is still alive
- TestRenderSurface surface2( PositionSize( 0.0f, 0.0f, 480.0f, 800.0f ) );
- Dali::Integration::Scene newScene = Dali::Integration::Scene::New( surface2 );
+ Dali::Integration::Scene newScene = Dali::Integration::Scene::New( Size( 480.0f, 800.0f ) );
DALI_TEST_CHECK( newScene );
// Render and notify.
END_TEST;
}
-int UtcDaliSceneDeleteSurface(void)
-{
- TestApplication application;
-
- // Create the render surface for the scene
- TestRenderSurface* renderSurface = new TestRenderSurface( Dali::PositionSize( 0, 0, 480.0f, 800.0f ) );
-
- // Create a Scene
- Dali::Integration::Scene scene = Dali::Integration::Scene::New( *renderSurface );
- DALI_TEST_CHECK( scene );
-
- // Render and notify.
- application.SendNotification();
- application.Render(0);
-
- // Add a renderable actor to the scene
- auto actor = CreateRenderableActor();
- scene.Add( actor );
-
- // Render and notify.
- application.SendNotification();
- application.Render(0);
-
- // Notify the Core that the render surface will be deleted.
- application.GetCore().SurfaceDeleted( renderSurface );
-
- // Delete the render surface
- delete renderSurface;
- renderSurface = nullptr;
-
- // Render and notify.
- application.SendNotification();
- application.Render(0);
-
- END_TEST;
-}
-
int UtcDaliSceneEventProcessingFinishedP(void)
{
TestApplication application;
// Add an actor to the scene.
Actor actor = Actor::New();
- actor.SetSize( 100.0f, 100.0f );
- actor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- actor.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
+ actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
actor.TouchedSignal().Connect( &DummyTouchCallback );
scene.Add( actor );
// Add an actor to the scene.
Actor actor = Actor::New();
- actor.SetSize( 100.0f, 100.0f );
- actor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- actor.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
+ actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
actor.TouchedSignal().Connect( &DummyTouchCallback );
scene.Add( actor );
END_TEST;
}
-int UtcDaliSceneEnsureEmptySceneCleared(void)
-{
- tet_infoline( "Ensure we clear the newly added window" );
-
- TestApplication application;
-
- // Create a new scene and set the background colors of both the new and the main scenes
- auto defaultScene = application.GetScene();
- defaultScene.SetBackgroundColor( Color::WHITE );
-
- TestRenderSurface surface( PositionSize( 0.0f, 0.0f, 480.0f, 800.0f ) );
- auto newScene = Integration::Scene::New( surface );
- newScene.SetBackgroundColor( Color::RED );
-
- // Need to create a renderable as we don't start rendering until we have at least one
- // We don't need to add this to any scene
- auto actor = CreateRenderableActor();
-
- auto& glAbstraction = application.GetGlAbstraction();
- auto clearCountBefore = glAbstraction.GetClearCountCalled();
-
- application.SendNotification();
- application.Render();
-
- DALI_TEST_EQUALS( glAbstraction.GetClearCountCalled(), clearCountBefore + 2, TEST_LOCATION );
-
- // Add the actor to the main scene
- defaultScene.Add( actor );
-
- application.SendNotification();
- application.Render();
-
- // Add another scene and set its background color, ensure we clear it to the appropriate color
-
- TestRenderSurface surface2( PositionSize( 0.0f, 0.0f, 480.0f, 800.0f ) );
- auto thirdScene = Integration::Scene::New( surface2 );
- thirdScene.SetBackgroundColor( Color::BLUE );
-
- clearCountBefore = glAbstraction.GetClearCountCalled();
-
- application.SendNotification();
- application.Render();
-
- DALI_TEST_EQUALS( glAbstraction.GetClearCountCalled(), clearCountBefore + 3, TEST_LOCATION );
-
- END_TEST;
-}
-
int UtcDaliSceneSurfaceResizedDefaultScene(void)
{
tet_infoline( "Ensure resizing of the surface is handled properly" );
TestApplication application;
auto defaultScene = application.GetScene();
- Integration::RenderSurface* defaultSurface = defaultScene.GetSurface();
- DALI_TEST_CHECK( defaultSurface );
+ DALI_TEST_CHECK( defaultScene );
- // Ensure stage size matches the surface size
+ // Ensure stage size matches the scene size
auto stage = Stage::GetCurrent();
- DALI_TEST_EQUALS( stage.GetSize(), Vector2( defaultSurface->GetPositionSize().width, defaultSurface->GetPositionSize().height ), TEST_LOCATION );
+ DALI_TEST_EQUALS( stage.GetSize(), defaultScene.GetSize(), TEST_LOCATION );
- // Resize the surface and inform the scene accordingly
+ // Resize the scene
Vector2 newSize( 1000.0f, 2000.0f );
DALI_TEST_CHECK( stage.GetSize() != newSize );
- defaultSurface->MoveResize( PositionSize( 0, 0, newSize.width, newSize.height ) );
- defaultScene.SurfaceResized();
+ defaultScene.SurfaceResized( newSize.width, newSize.height );
DALI_TEST_EQUALS( stage.GetSize(), newSize, TEST_LOCATION );
DALI_TEST_EQUALS( defaultScene.GetSize(), newSize, TEST_LOCATION );
Actor actor = Actor::New();
actor.AddRenderer(renderer);
- actor.SetSize(400, 400);
+ actor.SetProperty( Actor::Property::SIZE, Vector2( 400.0f, 400.0f ) );
Stage::GetCurrent().Add(actor);
// Render before resizing surface
glAbstraction.ResetViewportCallStack();
auto defaultScene = application.GetScene();
- Integration::RenderSurface* defaultSurface = defaultScene.GetSurface();
- DALI_TEST_CHECK( defaultSurface );
+ DALI_TEST_CHECK( defaultScene );
- // Ensure stage size matches the surface size
+ // Ensure stage size matches the scene size
auto stage = Stage::GetCurrent();
- DALI_TEST_EQUALS( stage.GetSize(), Vector2( defaultSurface->GetPositionSize().width, defaultSurface->GetPositionSize().height ), TEST_LOCATION );
+ DALI_TEST_EQUALS( stage.GetSize(), defaultScene.GetSize(), TEST_LOCATION );
- // Resize the surface and inform the scene accordingly
+ // Resize the scene
Vector2 newSize( 1000.0f, 2000.0f );
std::string viewportParams( "0, 0, 1000, 2000" ); // to match newSize
DALI_TEST_CHECK( stage.GetSize() != newSize );
- defaultSurface->MoveResize( PositionSize( 0, 0, newSize.width, newSize.height ) );
- defaultScene.SurfaceResized();
+ defaultScene.SurfaceResized( newSize.width, newSize.height );
DALI_TEST_EQUALS( stage.GetSize(), newSize, TEST_LOCATION );
DALI_TEST_EQUALS( defaultScene.GetSize(), newSize, TEST_LOCATION );
actor.AddRenderer(renderer);
int testWidth = 400;
int testHeight = 400;
- actor.SetSize(testWidth, testHeight);
+ actor.SetProperty( Actor::Property::SIZE, Vector2( testWidth, testHeight) );
stage.Add(actor);
CameraActor offscreenCameraActor = CameraActor::New( Size( testWidth, testHeight ) );
DALI_TEST_EQUALS( initialHeight, testHeight, TEST_LOCATION );
auto defaultScene = application.GetScene();
- Integration::RenderSurface* defaultSurface = defaultScene.GetSurface();
- DALI_TEST_CHECK( defaultSurface );
+ DALI_TEST_CHECK( defaultScene );
- // Ensure stage size matches the surface size
- DALI_TEST_EQUALS( stage.GetSize(), Vector2( defaultSurface->GetPositionSize().width, defaultSurface->GetPositionSize().height ), TEST_LOCATION );
+ // Ensure stage size matches the scene size
+ DALI_TEST_EQUALS( stage.GetSize(), defaultScene.GetSize(), TEST_LOCATION );
- // Resize the surface and inform the scene accordingly
- Vector2 newSize( 800.0f, 480.0f );
- std::string viewportParams( "0, 0, 800, 480" ); // to match newSize
+ // Resize the scene
+ Vector2 newSize( 1000.0f, 2000.0f );
+ std::string viewportParams( "0, 0, 1000, 2000" ); // to match newSize
DALI_TEST_CHECK( stage.GetSize() != newSize );
- defaultSurface->MoveResize( PositionSize( 0, 0, newSize.width, newSize.height ) );
- defaultScene.SurfaceResized();
+ defaultScene.SurfaceResized( newSize.width, newSize.height );
DALI_TEST_EQUALS( stage.GetSize(), newSize, TEST_LOCATION );
DALI_TEST_EQUALS( defaultScene.GetSize(), newSize, TEST_LOCATION );
TestApplication application;
Vector2 originalSurfaceSize( 500.0f, 1000.0f );
- TestRenderSurface surface( PositionSize( 0.0f, 0.0f, originalSurfaceSize.width, originalSurfaceSize.height ) );
- auto scene = Integration::Scene::New( surface );
+ auto scene = Integration::Scene::New( Size( originalSurfaceSize.width, originalSurfaceSize.height ) );
// Ensure stage size does NOT match the surface size
auto stage = Stage::GetCurrent();
// Resize the surface and inform the scene accordingly
Vector2 newSize( 1000.0f, 2000.0f );
DALI_TEST_CHECK( stage.GetSize() != newSize );
- surface.MoveResize( PositionSize( 0, 0, newSize.width, newSize.height ) );
- scene.SurfaceResized();
+ scene.SurfaceResized( newSize.width, newSize.height );
// Ensure the stage hasn't been resized
DALI_TEST_EQUALS( stage.GetSize(), stageSize, TEST_LOCATION );
END_TEST;
}
-int UtcDaliSceneSetSurface(void)
+int UtcDaliSceneKeyEventGeneratedSignalP(void)
{
- tet_infoline( "Scene::SetSurface test" );
+ TestApplication application;
+ Dali::Integration::Scene scene = application.GetScene();
+
+ KeyEventGeneratedSignalData data;
+ KeyEventGeneratedReceivedFunctor functor( data );
+ scene.KeyEventGeneratedSignal().Connect( &application, functor );
+
+ Integration::KeyEvent event( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Up, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+ application.ProcessEvent( event );
+
+ DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
+ DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.keyModifier );
+ DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.keyPressedName );
+ DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.keyPressed );
+ DALI_TEST_CHECK( event.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+
+ data.Reset();
+
+ Integration::KeyEvent event2( "i", "", "i", 0, 0, 0, Integration::KeyEvent::Up, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+ application.ProcessEvent( event2 );
+
+ DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
+ DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.keyModifier );
+ DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.keyPressedName );
+ DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.keyPressed );
+ DALI_TEST_CHECK( event2.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+
+ data.Reset();
+
+ Integration::KeyEvent event3( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Down, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+ application.ProcessEvent( event3 );
+
+ DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
+ DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.keyModifier );
+ DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.keyPressedName );
+ DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.keyPressed );
+ DALI_TEST_CHECK( event3.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+
+ data.Reset();
+
+ Integration::KeyEvent event4( "a", "", "a", 0, 0, 0, Integration::KeyEvent::Up, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
+ application.ProcessEvent( event4 );
+
+ DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
+ DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.keyModifier );
+ DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.keyPressedName );
+ DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.keyPressed );
+ DALI_TEST_CHECK( event4.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+ END_TEST;
+}
+
+int UtcDaliSceneEnsureReplacedSurfaceKeepsClearColor(void)
+{
+ tet_infoline( "Ensure we keep background color when the scene surface is replaced " );
TestApplication application;
- // Create a scene with a surface and ensure the size and surface is set correctly on the scene
- Vector2 surfaceSize( 480.0f, 800.0f );
- TestRenderSurface surface( PositionSize( 0.0f, 0.0f, surfaceSize.width, surfaceSize.height ) );
- auto scene = Integration::Scene::New( surface );
- DALI_TEST_EQUALS( scene.GetSize(), surfaceSize, TEST_LOCATION );
- DALI_TEST_CHECK( scene.GetSurface() == &surface );
-
- // Create a new surface and set that on the scene
- Vector2 newSurfaceSize( 1000.0f, 1000.0f );
- TestRenderSurface newSurface( PositionSize( 0.0f, 0.0f, newSurfaceSize.width, newSurfaceSize.height ) );
- scene.SetSurface( newSurface );
- DALI_TEST_EQUALS( scene.GetSize(), newSurfaceSize, TEST_LOCATION );
- DALI_TEST_CHECK( scene.GetSurface() == &newSurface );
-
- // Ensure setting the same surface again doesn't have any side effects
- scene.SetSurface( newSurface );
- DALI_TEST_EQUALS( scene.GetSize(), newSurfaceSize, TEST_LOCATION );
- DALI_TEST_CHECK( scene.GetSurface() == &newSurface );
+ // Create a new scene and set the background color of the main scene
+ auto defaultScene = application.GetScene();
+ defaultScene.SetBackgroundColor( Color::BLUE );
+
+ // Need to create a renderable as we don't start rendering until we have at least one
+ // We don't need to add this to any scene
+ auto actor = CreateRenderableActor();
+
+ auto& glAbstraction = application.GetGlAbstraction();
+ auto clearCountBefore = glAbstraction.GetClearCountCalled();
+
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_EQUALS( glAbstraction.GetClearCountCalled(), clearCountBefore + 1, TEST_LOCATION );
+ DALI_TEST_EQUALS( glAbstraction.GetLastClearColor(), Color::BLUE, TEST_LOCATION );
+
+ defaultScene.SurfaceReplaced();
+
+ application.SendNotification();
+ application.Render();
+
+ DALI_TEST_EQUALS( glAbstraction.GetClearCountCalled(), clearCountBefore + 2, TEST_LOCATION );
+ DALI_TEST_EQUALS( glAbstraction.GetLastClearColor(), Color::BLUE, TEST_LOCATION );
+
+ // Check when the main render task viewport is set the clear color is clipped using scissors
+ TraceCallStack& scissorTrace = glAbstraction.GetScissorTrace();
+ TraceCallStack& enabledDisableTrace = glAbstraction.GetEnableDisableTrace();
+ scissorTrace.Enable( true );
+ enabledDisableTrace.Enable( true );
+
+ defaultScene.GetRenderTaskList().GetTask( 0 ).SetViewport( Viewport( 0.0f, 0.0f, 100.0f, 100.0f ) );
+
+ application.SendNotification();
+ application.Render();
+
+ // Check scissor test was enabled.
+ DALI_TEST_CHECK( enabledDisableTrace.FindMethodAndParams( "Enable", "3089" ) ); // 3089 = 0xC11 (GL_SCISSOR_TEST)
+
+ // Check the scissor was set, and the coordinates are correct.
+ DALI_TEST_CHECK( scissorTrace.FindMethodAndParams( "Scissor", "0, 700, 100, 100" ) );
+
+ DALI_TEST_EQUALS( glAbstraction.GetClearCountCalled(), clearCountBefore + 3, TEST_LOCATION );
+ DALI_TEST_EQUALS( glAbstraction.GetLastClearColor(), Color::BLUE, TEST_LOCATION );
+
+ scissorTrace.Enable( false );
+ scissorTrace.Reset();
+
+ enabledDisableTrace.Enable( false );
+ enabledDisableTrace.Reset();
+
+ END_TEST;
+}
+
+int UtcDaliSceneEmptySceneRendering(void)
+{
+ tet_infoline( "Ensure not rendering before a Renderer is added" );
+
+ TestApplication application;
+ TestGlAbstraction& glAbstraction = application.GetGlAbstraction();
+
+ // Render without any renderer
+ application.SendNotification();
+ application.Render();
+
+ // Check the clear count and the render status
+ DALI_TEST_EQUALS( glAbstraction.GetClearCountCalled(), 0, TEST_LOCATION );
+ DALI_TEST_EQUALS( application.GetRenderNeedsPostRender(), false, TEST_LOCATION );
+
+ // Add a Renderer
+ Geometry geometry = CreateQuadGeometry();
+ Shader shader = CreateShader();
+ Renderer renderer = Renderer::New( geometry, shader );
+
+ Actor actor = Actor::New();
+ actor.AddRenderer( renderer );
+
+ actor.SetProperty( Actor::Property::SIZE, Vector2( 400, 400 ) );
+ Stage::GetCurrent().Add( actor );
+
+ // Render
+ application.SendNotification();
+ application.Render();
+
+ // Check the clear count and the render status
+ DALI_TEST_EQUALS( glAbstraction.GetClearCountCalled(), 1, TEST_LOCATION );
+ DALI_TEST_EQUALS( application.GetRenderNeedsPostRender(), true, TEST_LOCATION );
+
+ // Remove the Renderer
+ Stage::GetCurrent().Remove( actor );
+ actor.Reset();
+ renderer.Reset();
+
+ // Render
+ application.SendNotification();
+ application.Render();
+
+ // Check the clear count and the render status
+ DALI_TEST_EQUALS( glAbstraction.GetClearCountCalled(), 2, TEST_LOCATION ); // Should be cleared
+ DALI_TEST_EQUALS( application.GetRenderNeedsPostRender(), true, TEST_LOCATION );
END_TEST;
}
projects / platform / core / uifw / dali-core.git / blobdiff