Mercurial > mm7
diff Engine/Graphics/RenderD3D11.h @ 2574:dd36326a9994
More texture refactoring
GetLeather -> DrawTextureCustomHeight
author | a.parshin |
---|---|
date | Mon, 07 Mar 2016 03:48:40 +0200 |
parents | 0c67be4ec900 |
children | a76d408c5132 |
line wrap: on
line diff
--- a/Engine/Graphics/RenderD3D11.h Sat Mar 05 16:25:53 2016 +0200 +++ b/Engine/Graphics/RenderD3D11.h Mon Mar 07 03:48:40 2016 +0200 @@ -55,7 +55,7 @@ virtual void DrawPolygon(unsigned int uNumVertices, struct Polygon *a3, ODMFace *a4, IDirect3DTexture2 *pTexture); virtual void DrawTerrainPolygon(unsigned int uNumVertices, struct Polygon *a4, IDirect3DTexture2 *a5, bool transparent, bool clampAtTextureBorders); - virtual void DrawIndoorPolygon(unsigned int uNumVertices, struct BLVFace *a3, IDirect3DTexture2 *pHwTex, struct Texture *pTex, int uPackedID, unsigned int uColor, int a8); + virtual void DrawIndoorPolygon(unsigned int uNumVertices, struct BLVFace *a3, IDirect3DTexture2 *pHwTex, struct Texture_MM7 *pTex, int uPackedID, unsigned int uColor, int a8); virtual void MakeParticleBillboardAndPush_BLV(RenderBillboardTransform_local0 *a2, IDirect3DTexture2 *a3, unsigned int uDiffuse, int angle); virtual void MakeParticleBillboardAndPush_ODM(RenderBillboardTransform_local0 *a2, IDirect3DTexture2 *a3, unsigned int uDiffuse, int angle); @@ -78,30 +78,30 @@ virtual void ResetUIClipRect(); 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 Image *); virtual void DrawTextureAlphaNew(float u, float v, struct Image *); - virtual void DrawTextureTransparentColorKey(signed int x, signed int y, struct Texture *tex); + virtual void DrawTextureCustomHeight(float u, float v, class Image *img, int height); + //virtual void DrawTextureNew(float u, float v, struct Texture_MM7 *); + //virtual void DrawTextureTransparentColorKey(signed int x, signed int y, struct Texture_MM7 *tex); + //virtual void DrawTextureIndexedAlpha(unsigned int uX, unsigned int uY, struct Texture_MM7 *pTexture); - virtual void ZBuffer_Fill_2(signed int a2, signed int a3, struct Texture *pTexture, int a5); - virtual void DrawMaskToZBuffer(signed int uOutX, unsigned int uOutY, struct Texture *pTexture, int zVal); - virtual void DrawTextureIndexedAlpha(unsigned int uX, unsigned int uY, struct Texture *pTexture); - virtual void DrawAura(unsigned int a2, unsigned int a3, struct Texture *a4, struct Texture *a5, int a6, int a7, int a8); - virtual void _4A65CC(unsigned int x, unsigned int y, struct Texture *a4, struct Texture *a5, int a6, int a7, int a8); + virtual void ZBuffer_Fill_2(signed int a2, signed int a3, struct Image *pTexture, int a5); + virtual void ZDrawTextureAlpha(float u, float v, struct Image *pTexture, int zVal); + virtual void BlendTextures(unsigned int a2, unsigned int a3, struct Image *a4, struct Texture_MM7 *a5, int t, int start_opacity, int end_opacity); + virtual void _4A65CC(unsigned int x, unsigned int y, struct Texture_MM7 *a4, struct Texture_MM7 *a5, int a6, int a7, int a8); - virtual void DrawTransparentRedShade(unsigned int a2, unsigned int a3, struct Texture *a4); - virtual void DrawTransparentGreenShade(signed int a2, signed int a3, struct Texture *pTexture); + virtual void DrawTransparentRedShade(float u, float v, struct Image *a4); + virtual void DrawTransparentGreenShade(float u, float v, struct Image *pTexture); virtual void DrawFansTransparent(const RenderVertexD3D3 *vertices, unsigned int num_vertices); - virtual void DrawMasked(signed int a2, signed int a3, struct Texture *pTexture, unsigned __int16 mask); - virtual void GetLeather(unsigned int a2, unsigned int a3, struct Texture *a4, __int16 height); + virtual void DrawMasked(float u, float v, struct Image *pTexture, unsigned __int16 mask); virtual void DrawTextAlpha(int x, int y, unsigned char* font_pixels, int a5, unsigned int uFontHeight, unsigned __int16 *pPalette, bool present_time_transparency); virtual void DrawText(signed int uOutX, signed int uOutY, unsigned __int8 *pFontPixels, unsigned int uCharWidth, unsigned int uCharHeight, unsigned __int16 *pFontPalette, unsigned __int16 uFaceColor, unsigned __int16 uShadowColor); virtual void FillRectFast(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight, unsigned int uColor16); virtual void _4A6DF5(unsigned __int16 *pBitmap, unsigned int uBitmapPitch, struct Vec2_int_ *pBitmapXY, void *pTarget, unsigned int uTargetPitch, Vec4_int_ *a7); - virtual void DrawTranslucent(unsigned int a2, unsigned int a3, struct Texture *a4); + virtual void DrawTranslucent(unsigned int a2, unsigned int a3, struct Texture_MM7 *a4); virtual void DrawBuildingsD3D(); @@ -165,7 +165,7 @@ protected: void DrawTexture(float u, float v, int texture_width, int texture_height, ID3D11ShaderResourceView *srv, ID3D11BlendState *blend); - void PrepareTextureIndexed(struct Texture *p); + void PrepareTextureIndexed(struct Texture_MM7 *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);