mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 09:34:19 +00:00
Make override consistent
This commit is contained in:
Jupeyy
heinrich5991
parent
3b403f76a9
commit
1e1c16f83a
|
|
@ -724,144 +724,143 @@ class CGraphics_Threaded : public IEngineGraphics
|
||||||
public:
|
public:
|
||||||
CGraphics_Threaded();
|
CGraphics_Threaded();
|
||||||
|
|
||||||
virtual void ClipEnable(int x, int y, int w, int h);
|
void ClipEnable(int x, int y, int w, int h) override;
|
||||||
virtual void ClipDisable();
|
void ClipDisable() override;
|
||||||
|
|
||||||
virtual void BlendNone();
|
void BlendNone() override;
|
||||||
virtual void BlendNormal();
|
void BlendNormal() override;
|
||||||
virtual void BlendAdditive();
|
void BlendAdditive() override;
|
||||||
|
|
||||||
virtual void WrapNormal();
|
void WrapNormal() override;
|
||||||
virtual void WrapClamp();
|
void WrapClamp() override;
|
||||||
|
|
||||||
virtual int MemoryUsage() const;
|
int MemoryUsage() const override;
|
||||||
|
|
||||||
virtual void MapScreen(float TopLeftX, float TopLeftY, float BottomRightX, float BottomRightY);
|
void MapScreen(float TopLeftX, float TopLeftY, float BottomRightX, float BottomRightY) override;
|
||||||
virtual void GetScreen(float *pTopLeftX, float *pTopLeftY, float *pBottomRightX, float *pBottomRightY);
|
void GetScreen(float *pTopLeftX, float *pTopLeftY, float *pBottomRightX, float *pBottomRightY) override;
|
||||||
|
|
||||||
virtual void LinesBegin();
|
void LinesBegin() override;
|
||||||
virtual void LinesEnd();
|
void LinesEnd() override;
|
||||||
virtual void LinesDraw(const CLineItem *pArray, int Num);
|
void LinesDraw(const CLineItem *pArray, int Num) override;
|
||||||
|
|
||||||
virtual int UnloadTexture(IGraphics::CTextureHandle Index);
|
int UnloadTexture(IGraphics::CTextureHandle Index) override;
|
||||||
virtual IGraphics::CTextureHandle LoadTextureRaw(int Width, int Height, int Format, const void *pData, int StoreFormat, int Flags, const char *pTexName = NULL);
|
IGraphics::CTextureHandle LoadTextureRaw(int Width, int Height, int Format, const void *pData, int StoreFormat, int Flags, const char *pTexName = NULL) override;
|
||||||
virtual int LoadTextureRawSub(IGraphics::CTextureHandle TextureID, int x, int y, int Width, int Height, int Format, const void *pData);
|
int LoadTextureRawSub(IGraphics::CTextureHandle TextureID, int x, int y, int Width, int Height, int Format, const void *pData) override;
|
||||||
|
|
||||||
// simple uncompressed RGBA loaders
|
// simple uncompressed RGBA loaders
|
||||||
virtual IGraphics::CTextureHandle LoadTexture(const char *pFilename, int StorageType, int StoreFormat, int Flags);
|
IGraphics::CTextureHandle LoadTexture(const char *pFilename, int StorageType, int StoreFormat, int Flags) override;
|
||||||
virtual int LoadPNG(CImageInfo *pImg, const char *pFilename, int StorageType);
|
int LoadPNG(CImageInfo *pImg, const char *pFilename, int StorageType) override;
|
||||||
|
|
||||||
void CopyTextureBufferSub(uint8_t* pDestBuffer, uint8_t* pSourceBuffer, size_t FullWidth, size_t FullHeight, size_t ColorChannelCount, size_t SubOffsetX, size_t SubOffsetY, size_t SubCopyWidth, size_t SubCopyHeight) override;
|
void CopyTextureBufferSub(uint8_t* pDestBuffer, uint8_t* pSourceBuffer, size_t FullWidth, size_t FullHeight, size_t ColorChannelCount, size_t SubOffsetX, size_t SubOffsetY, size_t SubCopyWidth, size_t SubCopyHeight) override;
|
||||||
|
|
||||||
void ScreenshotDirect();
|
void ScreenshotDirect();
|
||||||
|
|
||||||
virtual void TextureSet(CTextureHandle TextureID);
|
void TextureSet(CTextureHandle TextureID) override;
|
||||||
|
|
||||||
virtual void Clear(float r, float g, float b);
|
void Clear(float r, float g, float b) override;
|
||||||
|
|
||||||
virtual void QuadsBegin();
|
void QuadsBegin() override;
|
||||||
virtual void QuadsEnd();
|
void QuadsEnd() override;
|
||||||
virtual void TextQuadsBegin();
|
void TextQuadsBegin() override;
|
||||||
virtual void TextQuadsEnd(int TextureSize, int TextTextureIndex, int TextOutlineTextureIndex, float* pOutlineTextColor);
|
void TextQuadsEnd(int TextureSize, int TextTextureIndex, int TextOutlineTextureIndex, float* pOutlineTextColor) override;
|
||||||
virtual void QuadsEndKeepVertices();
|
void QuadsEndKeepVertices() override;
|
||||||
virtual void QuadsDrawCurrentVertices(bool KeepVertices = true);
|
void QuadsDrawCurrentVertices(bool KeepVertices = true) override;
|
||||||
virtual void QuadsSetRotation(float Angle);
|
void QuadsSetRotation(float Angle) override;
|
||||||
|
|
||||||
virtual void SetColorVertex(const CColorVertex *pArray, int Num);
|
void SetColorVertex(const CColorVertex *pArray, int Num) override;
|
||||||
virtual void SetColor(float r, float g, float b, float a);
|
void SetColor(float r, float g, float b, float a) override;
|
||||||
virtual void SetColor(ColorRGBA rgb);
|
void SetColor(ColorRGBA rgb) override;
|
||||||
|
|
||||||
// go through all vertices and change their color (only works for quads)
|
// go through all vertices and change their color (only works for quads)
|
||||||
virtual void ChangeColorOfCurrentQuadVertices(float r, float g, float b, float a);
|
void ChangeColorOfCurrentQuadVertices(float r, float g, float b, float a) override;
|
||||||
virtual void ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a);
|
void ChangeColorOfQuadVertices(int QuadOffset, unsigned char r, unsigned char g, unsigned char b, unsigned char a) override;
|
||||||
|
|
||||||
void SetColor(CCommandBuffer::SVertex *pVertex, int ColorIndex);
|
void SetColor(CCommandBuffer::SVertex *pVertex, int ColorIndex);
|
||||||
|
|
||||||
virtual void QuadsSetSubset(float TlU, float TlV, float BrU, float BrV);
|
void QuadsSetSubset(float TlU, float TlV, float BrU, float BrV) override;
|
||||||
virtual void QuadsSetSubsetFree(
|
void QuadsSetSubsetFree(
|
||||||
float x0, float y0, float x1, float y1,
|
float x0, float y0, float x1, float y1,
|
||||||
float x2, float y2, float x3, float y3);
|
float x2, float y2, float x3, float y3) override;
|
||||||
|
|
||||||
virtual void QuadsDraw(CQuadItem *pArray, int Num);
|
void QuadsDraw(CQuadItem *pArray, int Num) override;
|
||||||
virtual void QuadsDrawTL(const CQuadItem *pArray, int Num);
|
void QuadsDrawTL(const CQuadItem *pArray, int Num) override;
|
||||||
virtual void QuadsDrawFreeform(const CFreeformItem *pArray, int Num);
|
void QuadsDrawFreeform(const CFreeformItem *pArray, int Num) override;
|
||||||
virtual void QuadsText(float x, float y, float Size, const char *pText);
|
void QuadsText(float x, float y, float Size, const char *pText) override;
|
||||||
|
|
||||||
virtual int CreateQuadContainer();
|
int CreateQuadContainer() override;
|
||||||
virtual void QuadContainerUpload(int ContainerIndex);
|
void QuadContainerUpload(int ContainerIndex) override;
|
||||||
virtual void QuadContainerAddQuads(int ContainerIndex, CQuadItem *pArray, int Num);
|
void QuadContainerAddQuads(int ContainerIndex, CQuadItem *pArray, int Num) override;
|
||||||
virtual void QuadContainerAddQuads(int ContainerIndex, CFreeformItem *pArray, int Num);
|
void QuadContainerAddQuads(int ContainerIndex, CFreeformItem *pArray, int Num) override;
|
||||||
virtual void QuadContainerReset(int ContainerIndex);
|
void QuadContainerReset(int ContainerIndex) override;
|
||||||
virtual void DeleteQuadContainer(int ContainerIndex);
|
void DeleteQuadContainer(int ContainerIndex) override;
|
||||||
virtual void RenderQuadContainer(int ContainerIndex, int QuadDrawNum);
|
void RenderQuadContainer(int ContainerIndex, int QuadDrawNum) override;
|
||||||
virtual void RenderQuadContainer(int ContainerIndex, int QuadOffset, int QuadDrawNum);
|
void RenderQuadContainer(int ContainerIndex, int QuadOffset, int QuadDrawNum) override;
|
||||||
virtual void RenderQuadContainerAsSprite(int ContainerIndex, int QuadOffset, float X, float Y, float ScaleX = 1.f, float ScaleY = 1.f);
|
void RenderQuadContainerAsSprite(int ContainerIndex, int QuadOffset, float X, float Y, float ScaleX = 1.f, float ScaleY = 1.f) override;
|
||||||
virtual void RenderQuadContainerAsSpriteMultiple(int ContainerIndex, int QuadOffset, int DrawCount, SRenderSpriteInfo *pRenderInfo);
|
void RenderQuadContainerAsSpriteMultiple(int ContainerIndex, int QuadOffset, int DrawCount, SRenderSpriteInfo *pRenderInfo) override;
|
||||||
|
|
||||||
virtual void FlushVertices(bool KeepVertices = false);
|
void FlushVertices(bool KeepVertices = false) override;
|
||||||
virtual void FlushTextVertices(int TextureSize, int TextTextureIndex, int TextOutlineTextureIndex, float *pOutlineTextColor);
|
void FlushTextVertices(int TextureSize, int TextTextureIndex, int TextOutlineTextureIndex, float *pOutlineTextColor) override;
|
||||||
|
|
||||||
virtual void RenderTileLayer(int BufferContainerIndex, float *pColor, char **pOffsets, unsigned int *IndicedVertexDrawNum, size_t NumIndicesOffet);
|
void RenderTileLayer(int BufferContainerIndex, float *pColor, char **pOffsets, unsigned int *IndicedVertexDrawNum, size_t NumIndicesOffet) override;
|
||||||
virtual void RenderBorderTiles(int BufferContainerIndex, float *pColor, char *pIndexBufferOffset, float *pOffset, float *pDir, int JumpIndex, unsigned int DrawNum);
|
void RenderBorderTiles(int BufferContainerIndex, float *pColor, char *pIndexBufferOffset, float *pOffset, float *pDir, int JumpIndex, unsigned int DrawNum) override;
|
||||||
virtual void RenderBorderTileLines(int BufferContainerIndex, float *pColor, char *pIndexBufferOffset, float *pOffset, float *pDir, unsigned int IndexDrawNum, unsigned int RedrawNum);
|
void RenderBorderTileLines(int BufferContainerIndex, float *pColor, char *pIndexBufferOffset, float *pOffset, float *pDir, unsigned int IndexDrawNum, unsigned int RedrawNum) override;
|
||||||
virtual void RenderQuadLayer(int BufferContainerIndex, SQuadRenderInfo* pQuadInfo, int QuadNum);
|
void RenderQuadLayer(int BufferContainerIndex, SQuadRenderInfo* pQuadInfo, int QuadNum) override;
|
||||||
virtual void RenderText(int BufferContainerIndex, int TextQuadNum, int TextureSize, int TextureTextIndex, int TextureTextOutlineIndex, float* pTextColor, float* pTextoutlineColor);
|
void RenderText(int BufferContainerIndex, int TextQuadNum, int TextureSize, int TextureTextIndex, int TextureTextOutlineIndex, float* pTextColor, float* pTextoutlineColor) override;
|
||||||
|
|
||||||
// opengl 3.3 functions
|
// opengl 3.3 functions
|
||||||
virtual int CreateBufferObject(size_t UploadDataSize, void* pUploadData);
|
int CreateBufferObject(size_t UploadDataSize, void* pUploadData) override;
|
||||||
virtual void RecreateBufferObject(int BufferIndex, size_t UploadDataSize, void* pUploadData);
|
void RecreateBufferObject(int BufferIndex, size_t UploadDataSize, void* pUploadData) override;
|
||||||
virtual void UpdateBufferObject(int BufferIndex, size_t UploadDataSize, void* pUploadData, void* pOffset);
|
void UpdateBufferObject(int BufferIndex, size_t UploadDataSize, void* pUploadData, void* pOffset) override;
|
||||||
virtual void CopyBufferObject(int WriteBufferIndex, int ReadBufferIndex, size_t WriteOffset, size_t ReadOffset, size_t CopyDataSize);
|
void CopyBufferObject(int WriteBufferIndex, int ReadBufferIndex, size_t WriteOffset, size_t ReadOffset, size_t CopyDataSize) override;
|
||||||
virtual void DeleteBufferObject(int BufferIndex);
|
void DeleteBufferObject(int BufferIndex) override;
|
||||||
|
|
||||||
virtual int CreateBufferContainer(SBufferContainerInfo *pContainerInfo);
|
int CreateBufferContainer(SBufferContainerInfo *pContainerInfo) override;
|
||||||
// destroying all buffer objects means, that all referenced VBOs are destroyed automatically, so the user does not need to save references to them
|
// destroying all buffer objects means, that all referenced VBOs are destroyed automatically, so the user does not need to save references to them
|
||||||
virtual void DeleteBufferContainer(int ContainerIndex, bool DestroyAllBO = true);
|
void DeleteBufferContainer(int ContainerIndex, bool DestroyAllBO = true) override;
|
||||||
virtual void UpdateBufferContainer(int ContainerIndex, SBufferContainerInfo *pContainerInfo);
|
void UpdateBufferContainer(int ContainerIndex, SBufferContainerInfo *pContainerInfo) override;
|
||||||
virtual void IndicesNumRequiredNotify(unsigned int RequiredIndicesCount);
|
void IndicesNumRequiredNotify(unsigned int RequiredIndicesCount) override;
|
||||||
|
|
||||||
|
int GetNumScreens() const override;
|
||||||
|
void Minimize() override;
|
||||||
|
void Maximize() override;
|
||||||
|
bool Fullscreen(bool State) override;
|
||||||
|
void SetWindowBordered(bool State) override;
|
||||||
|
bool SetWindowScreen(int Index) override;
|
||||||
|
void Resize(int w, int h) override;
|
||||||
|
void AddWindowResizeListener(WINDOW_RESIZE_FUNC pFunc, void *pUser) override;
|
||||||
|
int GetWindowScreen() override;
|
||||||
|
|
||||||
virtual int GetNumScreens() const;
|
int WindowActive() override;
|
||||||
virtual void Minimize();
|
int WindowOpen() override;
|
||||||
virtual void Maximize();
|
|
||||||
virtual bool Fullscreen(bool State);
|
|
||||||
virtual void SetWindowBordered(bool State);
|
|
||||||
virtual bool SetWindowScreen(int Index);
|
|
||||||
virtual void Resize(int w, int h);
|
|
||||||
virtual void AddWindowResizeListener(WINDOW_RESIZE_FUNC pFunc, void *pUser);
|
|
||||||
virtual int GetWindowScreen();
|
|
||||||
|
|
||||||
virtual int WindowActive();
|
void SetWindowGrab(bool Grab) override;
|
||||||
virtual int WindowOpen();
|
void NotifyWindow() override;
|
||||||
|
|
||||||
virtual void SetWindowGrab(bool Grab);
|
int Init() override;
|
||||||
virtual void NotifyWindow();
|
void Shutdown() override;
|
||||||
|
|
||||||
virtual int Init();
|
void TakeScreenshot(const char *pFilename) override;
|
||||||
virtual void Shutdown();
|
void TakeCustomScreenshot(const char *pFilename) override;
|
||||||
|
void Swap() override;
|
||||||
|
bool SetVSync(bool State) override;
|
||||||
|
|
||||||
virtual void TakeScreenshot(const char *pFilename);
|
int GetVideoModes(CVideoMode *pModes, int MaxModes, int Screen) override;
|
||||||
virtual void TakeCustomScreenshot(const char *pFilename);
|
|
||||||
virtual void Swap();
|
|
||||||
virtual bool SetVSync(bool State);
|
|
||||||
|
|
||||||
virtual int GetVideoModes(CVideoMode *pModes, int MaxModes, int Screen);
|
|
||||||
|
|
||||||
virtual int GetDesktopScreenWidth() { return m_DesktopScreenWidth; }
|
virtual int GetDesktopScreenWidth() { return m_DesktopScreenWidth; }
|
||||||
virtual int GetDesktopScreenHeight() { return m_DesktopScreenHeight; }
|
virtual int GetDesktopScreenHeight() { return m_DesktopScreenHeight; }
|
||||||
|
|
||||||
// synchronization
|
// synchronization
|
||||||
virtual void InsertSignal(semaphore *pSemaphore);
|
void InsertSignal(semaphore *pSemaphore) override;
|
||||||
virtual bool IsIdle();
|
bool IsIdle() override;
|
||||||
virtual void WaitForIdle();
|
void WaitForIdle() override;
|
||||||
|
|
||||||
virtual SGraphicsWarning *GetCurWarning();
|
SGraphicsWarning *GetCurWarning() override;
|
||||||
|
|
||||||
virtual bool IsTileBufferingEnabled() { return m_OpenGLTileBufferingEnabled; }
|
bool IsTileBufferingEnabled() override { return m_OpenGLTileBufferingEnabled; }
|
||||||
virtual bool IsQuadBufferingEnabled() { return m_OpenGLQuadBufferingEnabled; }
|
bool IsQuadBufferingEnabled() override { return m_OpenGLQuadBufferingEnabled; }
|
||||||
virtual bool IsTextBufferingEnabled() { return m_OpenGLTextBufferingEnabled; }
|
bool IsTextBufferingEnabled() override { return m_OpenGLTextBufferingEnabled; }
|
||||||
virtual bool IsQuadContainerBufferingEnabled() { return m_OpenGLQuadContainerBufferingEnabled; }
|
bool IsQuadContainerBufferingEnabled() override { return m_OpenGLQuadContainerBufferingEnabled; }
|
||||||
virtual bool HasTextureArrays() { return m_OpenGLHasTextureArrays; }
|
bool HasTextureArrays() override { return m_OpenGLHasTextureArrays; }
|
||||||
};
|
};
|
||||||
|
|
||||||
extern IGraphicsBackend *CreateGraphicsBackend();
|
extern IGraphicsBackend *CreateGraphicsBackend();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue