Fix compile error. Non initialized variable.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / model3d-view / model3d-view-impl.h

diff --git a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h
index 2202409..a3fed9b 100644 (file)
--- a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h
+++ b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_MODEL3D_VIEW_H__
-#define __DALI_TOOLKIT_INTERNAL_MODEL3D_VIEW_H__
+#ifndef DALI_TOOLKIT_INTERNAL_MODEL3D_VIEW_H
+#define DALI_TOOLKIT_INTERNAL_MODEL3D_VIEW_H

 
 /*
 
 /*

- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

-#include <dali/devel-api/rendering/renderer.h>
+#include <dali/public-api/rendering/renderer.h>

 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>


@@ -104,9 +104,9 @@ private:
   virtual void OnInitialize();
 
   /**
   virtual void OnInitialize();
 
   /**

-   * @copydoc CustomActorImpl::OnStageConnection()
+   * @copydoc CustomActorImpl::OnSceneConnection()

    */
    */

-  virtual void OnStageConnection( int depth );
+  virtual void OnSceneConnection( int depth );

 
 private:
 
 
 private:
 


@@ -146,11 +146,20 @@ private:
   void UpdateShaderUniforms();
 
 
   void UpdateShaderUniforms();
 
 

+  /*
+   * @brief Given a specific shader type, find out which properties are necessary for it.
+   *
+   * @param[in] illuminationType The type of shader we intend to use.
+   * @return A bitmask of the properties we require to be loaded to use the given shader.
+   */
+  int GetShaderProperties( Toolkit::Model3dView::IlluminationType illuminationType );
+
+

   ObjLoader mObjLoader;
 
   //Properties
   std::string mObjUrl;
   ObjLoader mObjLoader;
 
   //Properties
   std::string mObjUrl;

-  std::string mMaterialUrl;
+  std::string mTextureSetUrl;

   std::string mImagesUrl;
   std::string mTexture0Url;
   std::string mTexture1Url;
   std::string mImagesUrl;
   std::string mTexture0Url;
   std::string mTexture1Url;


@@ -166,7 +175,7 @@ private:
 
   //Render members
   Shader mShader;
 
   //Render members
   Shader mShader;

-  Material mMaterial;
+  TextureSet mTextureSet;

   Geometry mMesh;
   Renderer mRenderer;
 };
   Geometry mMesh;
   Renderer mRenderer;
 };


@@ -192,4 +201,4 @@ inline const Toolkit::Internal::Model3dView& GetImpl( const Toolkit::Model3dView
 
 } // namespace Dali
 
 
 } // namespace Dali
 

-#endif // __DALI_TOOLKIT_INTERNAL_MODEL_VIEW_H__
+#endif // DALI_TOOLKIT_INTERNAL_MODEL_VIEW_H