Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Stokes <mogurijin@gmail.com>2013-07-09 05:04:49 +0400
committerMitchell Stokes <mogurijin@gmail.com>2013-07-09 05:04:49 +0400
commit5b3106b89de68868fa6e9827b4b251e73a664b01 (patch)
tree1bb7b1585f3892f74a29d695c9f66a5c470726a4 /source/gameengine/GamePlayer/common/GPC_Canvas.h
parentabdb983a46ffa5e9f7e9d0fe13ae3d60b0e74365 (diff)
BGE cleanup: removing unused banner code from GPC_Canvas.
Diffstat (limited to 'source/gameengine/GamePlayer/common/GPC_Canvas.h')
-rw-r--r--source/gameengine/GamePlayer/common/GPC_Canvas.h101
1 files changed, 0 insertions, 101 deletions
diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h
index 07f96166ec2..4b03f76c6cc 100644
--- a/source/gameengine/GamePlayer/common/GPC_Canvas.h
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h
@@ -47,40 +47,7 @@
class GPC_Canvas : public RAS_ICanvas
{
-public:
- /**
- * Used to position banners in the canvas.
- */
- typedef enum {
- alignTopLeft,
- alignBottomRight
- } TBannerAlignment;
-
- typedef int TBannerId;
-
protected:
- /**
- * Used to store info for banners drawn on top of the canvas.
- */
- typedef struct {
- /** Where the banner will be displayed. */
- TBannerAlignment alignment;
- /** Banner display enabled. */
- bool enabled;
- /** Banner display width. */
- unsigned int displayWidth;
- /** Banner display height. */
- unsigned int displayHeight;
- /** Banner image width. */
- unsigned int imageWidth;
- /** Banner image height. */
- unsigned int imageHeight;
- /** Banner image data. */
- unsigned char* imageData;
- /** Banner OpenGL texture name. */
- unsigned int textureName;
- } TBannerData;
- typedef std::map<TBannerId, TBannerData> TBannerMap;
/** Width of the context. */
int m_width;
@@ -92,11 +59,6 @@ protected:
int m_viewport[4];
- /** Storage for the banners to display. */
- TBannerMap m_banners;
- /** State of banner display. */
- bool m_bannersEnabled;
-
public:
GPC_Canvas(int width, int height);
@@ -179,68 +141,7 @@ public:
void ClearBuffer(int type);
- /**
- * \section Services provided by this class.
- */
-
- /**
- * Enables display of a banner.
- * The image data is copied inside.
- * \param bannerWidth Display width of the banner.
- * \param bannerHeight Display height of the banner.
- * \param imageWidth Width of the banner image in pixels.
- * \param imageHeight Height of the banner image in pixels.
- * \param imageData Pointer to the pixels of the image to display.
- * \param alignment Where the banner will be positioned on the canvas.
- * \param enabled Whether the banner will be displayed initially.
- * \return A banner id.
- */
- TBannerId AddBanner(
- unsigned int bannerWidth, unsigned int bannerHeight,
- unsigned int imageWidth, unsigned int imageHeight,
- unsigned char* imageData, TBannerAlignment alignment = alignTopLeft,
- bool enabled = true);
-
- /**
- * Disposes a banner.
- * \param id Banner to be disposed.
- */
- void DisposeBanner(TBannerId id);
-
- /**
- * Disposes all the banners.
- */
- void DisposeAllBanners();
-
- /**
- * Enables or disables display of a banner.
- * \param id Banner id of the banner to be enabled/disabled.
- * \param enabled New state of the banner.
- */
- void SetBannerEnabled(TBannerId id, bool enabled = true);
-
- /**
- * Enables or disables display of all banners.
- * \param enabled New state of the banners.
- */
- void SetBannerDisplayEnabled(bool enabled = true);
-
protected:
- /**
- * Disposes a banner.
- * \param it Banner to be disposed.
- */
- void DisposeBanner(TBannerData& banner);
-
- /**
- * Draws all the banners enabled.
- */
- void DrawAllBanners(void);
-
- /**
- * Draws a banner.
- */
- void DrawBanner(TBannerData& banner);
struct CanvasRenderState {
int oldLighting;
@@ -270,8 +171,6 @@ protected:
void
SetOrthoProjection(
);
-
- static TBannerId s_bannerId;
};
#endif /* __GPC_CANVAS_H__ */