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
Applying changes to Scene::New()
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-application.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
index
1562d27
..
f3029fa
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
@@
-26,7
+26,8
@@
TestApplication::TestApplication( uint32_t surfaceWidth,
uint32_t surfaceHeight,
uint32_t horizontalDpi,
uint32_t verticalDpi,
uint32_t surfaceHeight,
uint32_t horizontalDpi,
uint32_t verticalDpi,
- ResourcePolicy::DataRetention policy)
+ ResourcePolicy::DataRetention policy,
+ bool initialize )
: mCore( NULL ),
mSurfaceWidth( surfaceWidth ),
mSurfaceHeight( surfaceHeight ),
: mCore( NULL ),
mSurfaceWidth( surfaceWidth ),
mSurfaceHeight( surfaceHeight ),
@@
-35,11
+36,21
@@
TestApplication::TestApplication( uint32_t surfaceWidth,
mLastVSyncTime(0u),
mDataRetentionPolicy( policy )
{
mLastVSyncTime(0u),
mDataRetentionPolicy( policy )
{
- Initialize();
+ if( initialize )
+ {
+ Initialize();
+ }
}
void TestApplication::Initialize()
{
}
void TestApplication::Initialize()
{
+ CreateCore();
+ CreateScene();
+ InitializeCore();
+}
+
+void TestApplication::CreateCore()
+{
// We always need the first update!
mStatus.keepUpdating = Integration::KeepUpdating::STAGE_KEEP_RENDERING;
// We always need the first update!
mStatus.keepUpdating = Integration::KeepUpdating::STAGE_KEEP_RENDERING;
@@
-47,7
+58,7
@@
void TestApplication::Initialize()
mPlatformAbstraction,
mGlAbstraction,
mGlSyncAbstraction,
mPlatformAbstraction,
mGlAbstraction,
mGlSyncAbstraction,
- mG
estureManager
,
+ mG
lContextHelperAbstraction
,
mDataRetentionPolicy,
Integration::RenderToFrameBuffer::FALSE,
Integration::DepthBufferAvailable::TRUE,
mDataRetentionPolicy,
Integration::RenderToFrameBuffer::FALSE,
Integration::DepthBufferAvailable::TRUE,
@@
-62,15
+73,17
@@
void TestApplication::Initialize()
Dali::Integration::Trace::InstallLogContextFunction( logContextFunction );
Dali::Integration::Trace::LogContext( true, "Test" );
Dali::Integration::Trace::InstallLogContextFunction( logContextFunction );
Dali::Integration::Trace::LogContext( true, "Test" );
+}
+void TestApplication::CreateScene()
+{
mRenderSurface = new TestRenderSurface( Dali::PositionSize( 0, 0, mSurfaceWidth, mSurfaceHeight ) );
mRenderSurface = new TestRenderSurface( Dali::PositionSize( 0, 0, mSurfaceWidth, mSurfaceHeight ) );
- mScene = Dali::Integration::Scene::New( Vector2( static_cast<float>( mSurfaceWidth ), static_cast<float>( mSurfaceHeight ) ) );
- mScene.SetSurface( *mRenderSurface );
-
+ mScene = Dali::Integration::Scene::New( *mRenderSurface );
mScene.SetDpi( Vector2( static_cast<float>( mDpi.x ), static_cast<float>( mDpi.y ) ) );
mScene.SetDpi( Vector2( static_cast<float>( mDpi.x ), static_cast<float>( mDpi.y ) ) );
+}
- mCore->SurfaceResized( mRenderSurface );
-
+void TestApplication::InitializeCore()
+{
mCore->SceneCreated();
mCore->Initialize();
}
mCore->SceneCreated();
mCore->Initialize();
}
@@
-141,9
+154,9
@@
TestGlSyncAbstraction& TestApplication::GetGlSyncAbstraction()
return mGlSyncAbstraction;
}
return mGlSyncAbstraction;
}
-TestG
estureManager& TestApplication::GetGestureManager
()
+TestG
lContextHelperAbstraction& TestApplication::GetGlContextHelperAbstraction
()
{
{
- return mG
estureManager
;
+ return mG
lContextHelperAbstraction
;
}
void TestApplication::ProcessEvent(const Integration::Event& event)
}
void TestApplication::ProcessEvent(const Integration::Event& event)