Mercurial > mm7

diff Engine/Graphics/RenderD3D11.h @ 2572:d87bfbd3bb3b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Step towards unification of Texture and RGBTexture (class Image)
author a.parshin
date Sat, 05 Mar 2016 01:51:54 +0200
parents c674d547cc7c
children 0c67be4ec900
line wrap: on
line diff
--- a/Engine/Graphics/RenderD3D11.h	Mon Oct 05 00:19:13 2015 +0200
+++ b/Engine/Graphics/RenderD3D11.h	Sat Mar 05 01:51:54 2016 +0200
@@ -79,8 +79,8 @@
   virtual void CreditsTextureScroll(unsigned int pX, unsigned int pY, int move_X, int move_Y, RGBTexture *pTexture);
   
   virtual void DrawTextureNew(float u, float v, struct Texture *);
-  virtual void DrawTextureNew(float u, float v, struct RGBTexture *);
-  virtual void DrawTextureRGB(unsigned int uOutX, unsigned int uOutY, RGBTexture *a4);
+  virtual void DrawTextureNew(float u, float v, struct Image *);
+  virtual void DrawTextureAlphaNew(float u, float v, struct Image *);
   virtual void DrawTextureIndexed(signed int x, signed int y, struct Texture *tex);
 
   virtual void ZBuffer_Fill_2(signed int a2, signed int a3, struct Texture *pTexture, int a5);
@@ -165,7 +165,6 @@
 
   protected:
     void DrawTexture(float u, float v, int texture_width, int texture_height, ID3D11ShaderResourceView *srv, ID3D11BlendState *blend);
-    void PrepareTexture(struct RGBTexture *p);
     void PrepareTextureIndexed(struct Texture *p);
     ID3D11ShaderResourceView *PrepareFontTexture(unsigned char *pFontPixels, unsigned int uCharWidth, unsigned int uCharHeight, unsigned short *pFontPalette, unsigned short uFaceColor, unsigned short uShadowColor);
     ID3D11ShaderResourceView *PrepareFontTexture(unsigned char *pFontPixels, unsigned int uCharWidth, unsigned int uCharHeight, unsigned short *pFontPalette);