Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / internal / event / actors / camera-actor-impl.h

diff --git a/dali/internal/event/actors/camera-actor-impl.h b/dali/internal/event/actors/camera-actor-impl.h
index 5ffa230..30f9bc6 100644 (file)
--- a/dali/internal/event/actors/camera-actor-impl.h
+++ b/dali/internal/event/actors/camera-actor-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_CAMERA_ACTOR_H__
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -31,11 +31,11 @@ namespace Internal
 
 namespace SceneGraph
 {
-class CameraAttachment;
+class Camera;
 }
 
 /**
- * An actor with CameraAttachment.
+ * An actor with Camera.
  */
 class CameraActor : public Actor
 {
@@ -190,6 +190,12 @@ public:
    */
   const Matrix& GetProjectionMatrix() const;
 
+  /**
+   * Return the scene graph camera (for RenderTask)
+   * @return The scene graph camera.
+   */
+  const SceneGraph::Camera* GetCamera() const;
+
 public: // properties
 
   /**
@@ -228,16 +234,21 @@ public: // properties
   virtual Property::Index GetDefaultPropertyIndex(const std::string& name) const;
 
   /**
-   * copydoc Dali::Internal::Object
+   * copydoc Dali::Internal::Object::SetDefaultProperty()
    */
   virtual void SetDefaultProperty( Property::Index index, const Property::Value& propertyValue );
 
   /**
-   * copydoc Dali::Internal::Object
+   * copydoc Dali::Internal::Object::GetDefaultProperty()
    */
   virtual Property::Value GetDefaultProperty( Property::Index index ) const;
 
   /**
+   * copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
+   */
+  virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const;
+
+  /**
    * copydoc Dali::Internal::Object
    */
   virtual bool IsDefaultPropertyWritable( Property::Index index ) const ;
@@ -266,7 +277,7 @@ private:
 
 private: // Data
 
-  const SceneGraph::CameraAttachment* mSceneObject; ///< Not owned
+  const SceneGraph::Camera* mSceneObject; ///< Not owned
 
   Vector3            mTarget;
   Dali::Camera::Type mType;