Merge "Tizen Directory Migration" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / renderers / mesh / mesh-renderer.h

diff --git a/dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.h b/dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.h
index ede12fb..2407a09 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.h
+++ b/dali-toolkit/internal/controls/renderers/mesh/mesh-renderer.h
@@ -40,12 +40,15 @@ namespace Internal
  *
  * The following Property::Map keys are required to create a MeshRender
  *
- * | %Property Name  | Type        | Representing                            |
- * |-----------------|-------------|-----------------------------------------|
- * | objectUrl       | STRING      | A URL to the .obj file                  |
- * | materialUrl     | STRING      | A URL to the .mtl file                  |
- * | texturesPath    | STRING      | A URL of the path to the texture images |
- * | shaderType      | STRING      | An enum of shader types                 |
+ * | %Property Name  | Type        | Representing                                                          |
+ * |-----------------|-------------|-----------------------------------------------------------------------|
+ * | objectUrl       | STRING      | A URL to the .obj file                                                |
+ * | materialUrl     | STRING      | A URL to the .mtl file                                                |
+ * | texturesPath    | STRING      | A URL of the path to the texture images                               |
+ * | shaderType      | STRING      | An enum of shader types                                               |
+ * | useMipmapping   | BOOLEAN     | If true, use mipmaps for textures. Default true.                      |
+ * | useSoftNormals  | BOOLEAN     | If true, average normals at points for smooth textures. Default true. |
+ * | lightPosition   | VECTOR3     | The position (on stage) of the light                                  |
  */
 class MeshRenderer: public ControlRenderer
 {
@@ -184,8 +187,6 @@ private:
   std::string mGlossTextureUrl;
   std::string mTexturesPath;
 
-  std::string mShaderTypeString;
-
   Shader mShader;
   Geometry mGeometry;
   TextureSet mTextureSet;
@@ -193,9 +194,13 @@ private:
   ObjLoader mObjLoader;
   Vector3 mSceneCenter;
   Vector3 mSceneSize;
+
+  Vector3 mLightPosition;
   ShaderType mShaderType;
 
   bool mUseTexture;
+  bool mUseMipmapping;
+  bool mUseSoftNormals;
 };
 
 } // namespace Internal