Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 692 vs 709 for /trunk/Source Code/Platform/Video/Textures/Headers/Texture.h

Diff revisions: vs.
  @@ -60,6 +60,14 @@
60 60 I32 _cubeMapCount;
61 61 };
62 62 public:
63 +
64 + explicit Texture(GFXDevice& context,
65 + const stringImpl& name,
66 + const stringImpl& resourceLocation,
67 + TextureType type,
68 + bool asyncLoad);
69 + virtual ~Texture();
70 +
63 71 /// Bind the texture to the specified texture unit
64 72 virtual void Bind(U8 slot, bool flushStateOnRequest = true) = 0;
65 73 /// Bind a single level
  @@ -139,8 +147,6 @@
139 147 }
140 148
141 149 protected:
142 - SET_DELETE_FRIEND
143 -
144 150 /// Use STB/NV_DDS to load a file into a Texture Object
145 151 bool LoadFile(const TextureLoadInfo& info, const stringImpl& name);
146 152 /// Load texture data using the specified file name
  @@ -149,13 +155,6 @@
149 155 /// Force a refresh of the entire mipmap chain
150 156 virtual void updateMipMaps() = 0;
151 157
152 - explicit Texture(GFXDevice& context,
153 - const stringImpl& name,
154 - const stringImpl& resourceLocation,
155 - TextureType type,
156 - bool asyncLoad);
157 - virtual ~Texture();
158 -
159 158 protected:
160 159 U8 _numLayers;
161 160 U16 _width;
  @@ -172,5 +171,7 @@
172 171 TextureDescriptor _descriptor;
173 172 };
174 173
174 + TYPEDEF_SMART_POINTERS_FOR_CLASS(Texture);
175 +
175 176 }; // namespace Divide
176 177 #endif // _TEXTURE_H_