Removed model loading and lighting

[platform/core/uifw/dali-core.git] / dali / integration-api / resource-types.h

diff --git a/dali/integration-api/resource-types.h b/dali/integration-api/resource-types.h
index f8f0d65..19c1703 100644 (file)
--- a/dali/integration-api/resource-types.h
+++ b/dali/integration-api/resource-types.h
@@ -1,27 +1,30 @@
 #ifndef __DALI_INTEGRATION_RESOURCE_TYPES_H__
 #define __DALI_INTEGRATION_RESOURCE_TYPES_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 <stdint.h>
-#include <vector>
+#include <string>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/images/image-attributes.h>
 #include <dali/integration-api/resource-declarations.h>
 
@@ -42,7 +45,6 @@ enum ResourceTypeId
   ResourceNativeImage,
   ResourceTargetImage,
   ResourceShader,
-  ResourceModel,
   ResourceMesh,
   ResourceText
 };
@@ -50,7 +52,7 @@ enum ResourceTypeId
 /**
  * The abstract base class for resource types.
  */
-struct DALI_IMPORT_API ResourceType
+struct ResourceType
 {
   /**
    * Constructor.
@@ -85,7 +87,7 @@ private:
  * BitmapResourceType describes a bitmap resource, which can be requested
  * from ResourceLoader::LoadResource() or AllocateBitmapImage.
  */
-struct DALI_IMPORT_API BitmapResourceType : public ResourceType
+struct BitmapResourceType : public ResourceType
 {
   /**
    * Constructor.
@@ -127,7 +129,7 @@ private:
  * through ResourceManager::AddNativeImage() or requested through ResourceLoader::LoadResource().
  * If the adaptor does not support NativeImages, it can fall back to Bitmap type.
  */
-struct DALI_IMPORT_API NativeImageResourceType : public ResourceType
+struct NativeImageResourceType : public ResourceType
 {
   /**
    * Constructor.
@@ -174,7 +176,7 @@ private:
  * RenderTargetResourceType describes a bitmap resource, which can injected
  * through ResourceManager::AddTargetImage()
  */
-struct DALI_IMPORT_API RenderTargetResourceType : public ResourceType
+struct RenderTargetResourceType : public ResourceType
 {
   /**
    * Constructor.
@@ -221,7 +223,7 @@ private:
  * ShaderResourceType describes a shader program resource, which can be requested
  * from PlatformAbstraction::LoadResource()
  */
-struct DALI_IMPORT_API ShaderResourceType : public ResourceType
+struct ShaderResourceType : public ResourceType
 {
   /**
    * Constructor.
@@ -267,7 +269,7 @@ private:
  * TextResourceType describes a font resource, which can be requested.
  * from PlatformAbstraction::LoadResource()  No font atlas is created.
  */
-struct DALI_IMPORT_API TextResourceType : public ResourceType
+struct TextResourceType : public ResourceType
 {
   /**
    *  Text quality enum
@@ -402,50 +404,12 @@ private:
   TextResourceType& operator=(const TextResourceType& rhs);
 };
 
-/**
- * ModelResourceType describes a model resource, which can be requested
- * from PlatformAbstraction::LoadResource()
- */
-struct DALI_IMPORT_API ModelResourceType : public ResourceType
-{
-  /**
-   * Constructor.
-   */
-  ModelResourceType()
-    : ResourceType(ResourceModel)
-  {
-  }
-
-  /**
-   * Destructor.
-   */
-  virtual ~ModelResourceType()
-  {
-  }
-
-  /**
-   * @copydoc ResourceType::Clone
-   */
-  virtual ResourceType* Clone() const
-  {
-    return new ModelResourceType();
-  }
-
-private:
-
-  // Undefined copy constructor.
-  ModelResourceType(const ModelResourceType& typePath);
-
-  // Undefined assignment operator.
-  ModelResourceType& operator=(const ModelResourceType& rhs);
-};
-
 
 /**
  * MeshResourceType describes a mesh program resource, which can be created
  * using ResourceManager::AllocateMesh.
  */
-struct DALI_IMPORT_API MeshResourceType : public ResourceType
+struct MeshResourceType : public ResourceType
 {
   /**
    * Constructor.
@@ -485,4 +449,3 @@ inline bool operator==(const TextResourceType::GlyphPosition& lhs, const TextRes
 } // namespace Dali
 
 #endif // __DALI_INTEGRATION_RESOURCE_TYPES_H__
-