X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Fintegration-api%2Fcore.h;h=2a2fbb08ce4faf4bfd12a17e6b8b54c2da165b12;hb=dcaa0851afa012f5c6e0f01cf2318772a9201655;hp=6be726911e3cd01144d63dd1372307c1d41af9f4;hpb=ce20e9f082e811130930d13c9e9edc1da4ce1013;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/integration-api/core.h b/dali/integration-api/core.h index 6be7269..2a2fbb0 100644 --- a/dali/integration-api/core.h +++ b/dali/integration-api/core.h @@ -1,24 +1,28 @@ #ifndef __DALI_INTEGRATION_CORE_H__ #define __DALI_INTEGRATION_CORE_H__ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // EXTERNAL INCLUDES #include +#include +#include +#include namespace Dali { @@ -41,6 +45,7 @@ class SystemOverlay; struct Event; struct TouchData; + /** * The reasons why further updates are required. */ @@ -54,15 +59,14 @@ namespace KeepUpdating DALI_IMPORT_API extern const unsigned int ANIMATIONS_RUNNING; ///< 0x04 - Animations are ongoing extern const unsigned int DYNAMICS_CHANGED; ///< 0x08 - A dynamics simulation is running extern const unsigned int LOADING_RESOURCES; ///< 0x10 - Resources are being loaded - extern const unsigned int NOTIFICATIONS_PENDING; ///< 0x20 - Notifications are pending for the event-thread - extern const unsigned int MONITORING_PERFORMANCE; ///< 0x40 - The --enable-performance-monitor option is being used - extern const unsigned int RENDER_TASK_SYNC; ///< 0x80 - A render task is waiting for render sync + extern const unsigned int MONITORING_PERFORMANCE; ///< 0x20 - The --enable-performance-monitor option is being used + extern const unsigned int RENDER_TASK_SYNC; ///< 0x40 - A render task is waiting for render sync }; /** * The status of the Core::Update operation. */ -class DALI_IMPORT_API UpdateStatus +class UpdateStatus { public: @@ -108,7 +112,7 @@ public: /** * The status of the Core::Render operation. */ -class DALI_IMPORT_API RenderStatus +class RenderStatus { public: @@ -204,13 +208,17 @@ public: * @param[in] glAbstraction The interface providing OpenGL services. * @param[in] glSyncAbstraction The interface providing OpenGL sync objects. * @param[in] gestureManager The interface providing gesture manager services. + * @param[in] policy The data retention policy. This depends on application setting + * and platform support. Dali should honour this policy when deciding to discard + * intermediate resource data. * @return A newly allocated Core. */ static Core* New(RenderController& renderController, PlatformAbstraction& platformAbstraction, GlAbstraction& glAbstraction, GlSyncAbstraction& glSyncAbstraction, - GestureManager& gestureManager); + GestureManager& gestureManager, + ResourcePolicy::DataRetention policy); /** * Non-virtual destructor. Core is not intended as a base class. @@ -220,6 +228,11 @@ public: // GL Context Lifecycle /** + * Get the object that will notify the application/toolkit when context is lost/regained + */ + ContextNotifierInterface* GetContextNotifier(); + + /** * Notify the Core that the GL context has been created. * The context must be created before the Core can render. * Multi-threading note: this method should be called from the rendering thread only @@ -233,7 +246,18 @@ public: * Multi-threading note: this method should be called from the rendering thread only * @post The Core is unaware of any GL context. */ - void ContextToBeDestroyed(); + void ContextDestroyed(); + + /** + * Notify the Core that the GL context has been re-created, e.g. after ReplaceSurface + * or Context loss. + * + * In the case of ReplaceSurface, both ContextToBeDestroyed() and ContextCreated() will have + * been called on the render thread before this is called on the event thread. + * + * Multi-threading note: this method should be called from the main thread + */ + void RecoverFromContextLoss(); /** * Notify the Core that the GL surface has been resized. @@ -257,22 +281,6 @@ public: */ void SetDpi(unsigned int dpiHorizontal, unsigned int dpiVertical); - /** - * Sets the expected interval between frames used to predict future intervals and the time when the - * next render will take place. - * - * This is the minimum interval that Core should expect. Core will adapt the predicted interval - * accordingly if the expected interval is constantly not met (but will not drop it below this - * amount). - * - * The value provided should be in microseconds. - * - * @param[in] interval The minimum interval between frames (in microseconds). - * - * Multi-threading note: this method should be called from the render thread - */ - void SetMinimumFrameTimeInterval(unsigned int interval); - // Core Lifecycle /** @@ -295,17 +303,8 @@ public: void Resume(); /** - * @deprecated - This is equivalent to: - * @code - * Core::QueueEvent(event); - * Core::ProcessEvents(); - * @endcode - */ - void SendEvent(const Event& event); - - /** * Queue an event with Core. - * Pre-processing of events may be benificial e.g. a series of motion events could be throttled, so that only the last event is queued. + * Pre-processing of events may be beneficial e.g. a series of motion events could be throttled, so that only the last event is queued. * Multi-threading note: this method should be called from the main thread. * @param[in] event The new event. */ @@ -344,10 +343,13 @@ public: * However the update-thread must wait until frame N has been rendered, before processing frame N+2. * After this method returns, messages may be queued internally for the main thread. * In order to process these messages, a notification is sent via the main thread's event loop. + * @param[in] elapsedSeconds Number of seconds since the last call + * @param[in] lastVSyncTimeMilliseconds The last vsync time in milliseconds + * @param[in] nextVSyncTimeMilliseconds The time of the next predicted VSync in milliseconds * @param[out] status showing whether further updates are required. This also shows * whether a Notification event should be sent, regardless of whether the multi-threading is used. */ - void Update( UpdateStatus& status ); + void Update( float elapsedSeconds, unsigned int lastVSyncTimeMilliseconds, unsigned int nextVSyncTimeMilliseconds, UpdateStatus& status ); /** * Render the next frame. This method should be preceded by a call up Update. @@ -357,38 +359,38 @@ public: */ void Render( RenderStatus& status ); + // System-level overlay + /** - * Tells core that it is about to sleep. - * Application is running as normal, but no updates are taking place i.e. no ongoing animations. - * This should be called when we choose to stop updating and rendering when there are no screen - * updates required. - * Multi-threading note: this method should be called from the update-thread. + * Use the SystemOverlay to draw content for system-level indicators, dialogs etc. + * @return The SystemOverlay. */ - void Sleep(); + SystemOverlay& GetSystemOverlay(); /** - * Wakes up core from a sleep state. - * At the first update the elapsed time passed to the animations is zero. - * Multi-threading note: this method should be called from the update-thread. + * Set the stereoscopic 3D view mode + * @param[in] viewMode The new view mode */ - void WakeUp(); + void SetViewMode( ViewMode viewMode ); /** - * Notification of a vertical blank sync - * @param[in] frameNumber The frame number of this vsync. This number will not update - * while paused. - * @param[in] seconds The timestamp seconds - * @param[in] microseconds The timestamp microseconds + * Get the current view mode + * @return The current view mode + * @see SetViewMode. */ - void VSync( unsigned int frameNumber, unsigned int seconds, unsigned int microseconds ); + ViewMode GetViewMode() const; - // System-level overlay + /** + * Set the stereo base (eye seperation) for stereoscopic 3D + * @param[in] stereoBase The stereo base (eye seperation) for stereoscopic 3D (mm) + */ + void SetStereoBase( float stereoBase ); /** - * Use the SystemOverlay to draw content for system-level indicators, dialogs etc. - * @return The SystemOverlay. + * Get the stereo base (eye seperation) for stereoscopic 3D + * @return The stereo base (eye seperation) for stereoscopic 3D (mm) */ - SystemOverlay& GetSystemOverlay(); + float GetStereoBase() const; private: