From 96f7714510cba0a84cd749869f236188473c4553 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 30 Dec 2013 20:07:34 +0300 Subject: rename shared files in renderers. --- src/CMakeLists.txt | 4 +- src/Makefile.am | 4 +- src/render/graphics_calcImageRect.hpp | 90 +++++++++++++++++++++++++++++ src/render/graphics_drawImageRect.hpp | 83 ++++++++++++++++++++++++++ src/render/openglgraphics_calcImageRect.hpp | 90 ----------------------------- src/render/openglgraphics_drawImageRect.hpp | 83 -------------------------- 6 files changed, 177 insertions(+), 177 deletions(-) create mode 100644 src/render/graphics_calcImageRect.hpp create mode 100644 src/render/graphics_drawImageRect.hpp delete mode 100644 src/render/openglgraphics_calcImageRect.hpp delete mode 100644 src/render/openglgraphics_drawImageRect.hpp (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d8d2ce6c3..65f5a0f44 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -696,10 +696,10 @@ SET(SRCS notifications.h notifymanager.cpp notifymanager.h + render/graphics_calcImageRect.hpp + render/graphics_drawImageRect.hpp render/nullopenglgraphics.cpp render/nullopenglgraphics.h - render/openglgraphics_calcImageRect.hpp - render/openglgraphics_drawImageRect.hpp render/openglgraphicsdef.hpp render/renderers.cpp render/renderers.h diff --git a/src/Makefile.am b/src/Makefile.am index 8c05c8a2e..c7ee06128 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -833,10 +833,10 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ notifications.h \ notifymanager.cpp \ notifymanager.h \ + render/graphics_calcImageRect.hpp \ + render/graphics_drawImageRect.hpp \ render/nullopenglgraphics.cpp \ render/nullopenglgraphics.h \ - render/openglgraphics_calcImageRect.hpp \ - render/openglgraphics_drawImageRect.hpp \ render/openglgraphicsdef.hpp \ render/renderers.cpp \ render/renderers.h \ diff --git a/src/render/graphics_calcImageRect.hpp b/src/render/graphics_calcImageRect.hpp new file mode 100644 index 000000000..403c85ba7 --- /dev/null +++ b/src/render/graphics_calcImageRect.hpp @@ -0,0 +1,90 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2013 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +//bool Graphics::calcImageRect(ImageVertexes *const vert, +// const int x, const int y, +// const int w, const int h, +// const ImageRect &imgRect) + +if (!vert) + return; + +BLOCK_START("Graphics::calcImageRect") + +const Image *const *const grid = imgRect.grid; +const Image *const topLeft = grid[0]; +const Image *const topRight = grid[2]; +const Image *const bottomLeft = grid[6]; +const Image *const bottomRight = grid[8]; +const Image *const top = grid[1]; +const Image *const right = grid[5]; +const Image *const bottom = grid[7]; +const Image *const left = grid[3]; +const Image *const center = grid[4]; + +const bool drawMain = center && topLeft && topRight + && bottomLeft && bottomRight; + +// Draw the center area +if (center && drawMain) +{ + const int tlw = topLeft->getWidth(); + const int tlh = topLeft->getHeight(); + calcPattern(vert, center, tlw + x, tlh + y, + w - tlw - topRight->getWidth(), + h - tlh - bottomLeft->getHeight()); +} +// Draw the sides +if (top && left && bottom && right) +{ + const int lw = left->getWidth(); + const int rw = right->getWidth(); + const int th = top->getHeight(); + const int bh = bottom->getHeight(); + calcPattern(vert, top, x + lw, y, w - lw - rw, th); + calcPattern(vert, bottom, x + lw, y + h - bh, w - lw - rw, bh); + calcPattern(vert, left, x, y + th, lw, h - th - bh); + if (w > rw) + calcPattern(vert, right, x + w - rw, y + th, rw, h - th - bh); +} + +calcTileVertexes(vert, topLeft, x, y); +if (topRight) +{ + const int trw = topRight->getWidth(); + if (w > trw) + calcTileVertexes(vert, topRight, x + w - trw, y); +} +if (bottomLeft) + calcTileVertexes(vert, bottomLeft, x, y + h - bottomLeft->getHeight()); +if (bottomRight) +{ + const int brw = bottomRight->getWidth(); + if (w > brw) + { + calcTileVertexes(vert, bottomRight, x + w - brw, + y + h - bottomRight->getHeight()); + } +} + +BLOCK_END("Graphics::calcImageRect") diff --git a/src/render/graphics_drawImageRect.hpp b/src/render/graphics_drawImageRect.hpp new file mode 100644 index 000000000..5c4bba0a1 --- /dev/null +++ b/src/render/graphics_drawImageRect.hpp @@ -0,0 +1,83 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2013 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +//void GraphicsX::drawImageRect(const int x, const int y, +// const int w, const int h, +// const ImageRect &imgRect) + +BLOCK_START("Graphics::drawImageRect") + +const Image *const *const grid = imgRect.grid; +const Image *const topLeft = grid[0]; +const Image *const topRight = grid[2]; +const Image *const bottomLeft = grid[6]; +const Image *const bottomRight = grid[8]; +const Image *const top = grid[1]; +const Image *const right = grid[5]; +const Image *const bottom = grid[7]; +const Image *const left = grid[3]; +const Image *const center = grid[4]; + +const bool drawMain = center && topLeft && topRight + && bottomLeft && bottomRight; + +// Draw the center area +if (center && drawMain) +{ + const int tlw = topLeft->getWidth(); + const int tlh = topLeft->getHeight(); + drawPatternInline(center, tlw + x, tlh + y, + w - tlw - topRight->getWidth(), + h - tlh - bottomLeft->getHeight()); +} + +// Draw the sides +if (top && left && bottom && right) +{ + const int lw = left->getWidth(); + const int rw = right->getWidth(); + const int th = top->getHeight(); + const int bh = bottom->getHeight(); + drawPatternInline(top, x + lw, y, w - lw - rw, th); + drawPatternInline(bottom, x + lw, h - bh + y, w - lw - rw, bh); + drawPatternInline(left, x, y + th, lw, h - th - bh); + if (w > rw) + drawPatternInline(right, x + w - rw, th + y, rw, h - th - bh); +} +// Draw the corners +if (drawMain) +{ + drawImage2(topLeft, x, y); + const int trw = topRight->getWidth(); + if (w > trw) + drawImage2(topRight, x + w - trw, y); + drawImage2(bottomLeft, x, h - bottomLeft->getHeight() + y); + const int brw = bottomRight->getWidth(); + if (w > brw) + { + drawImage2(bottomRight, + x + w - brw, + y + h - bottomRight->getHeight()); + } +} +BLOCK_END("Graphics::drawImageRect") diff --git a/src/render/openglgraphics_calcImageRect.hpp b/src/render/openglgraphics_calcImageRect.hpp deleted file mode 100644 index 403c85ba7..000000000 --- a/src/render/openglgraphics_calcImageRect.hpp +++ /dev/null @@ -1,90 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2013 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -//bool Graphics::calcImageRect(ImageVertexes *const vert, -// const int x, const int y, -// const int w, const int h, -// const ImageRect &imgRect) - -if (!vert) - return; - -BLOCK_START("Graphics::calcImageRect") - -const Image *const *const grid = imgRect.grid; -const Image *const topLeft = grid[0]; -const Image *const topRight = grid[2]; -const Image *const bottomLeft = grid[6]; -const Image *const bottomRight = grid[8]; -const Image *const top = grid[1]; -const Image *const right = grid[5]; -const Image *const bottom = grid[7]; -const Image *const left = grid[3]; -const Image *const center = grid[4]; - -const bool drawMain = center && topLeft && topRight - && bottomLeft && bottomRight; - -// Draw the center area -if (center && drawMain) -{ - const int tlw = topLeft->getWidth(); - const int tlh = topLeft->getHeight(); - calcPattern(vert, center, tlw + x, tlh + y, - w - tlw - topRight->getWidth(), - h - tlh - bottomLeft->getHeight()); -} -// Draw the sides -if (top && left && bottom && right) -{ - const int lw = left->getWidth(); - const int rw = right->getWidth(); - const int th = top->getHeight(); - const int bh = bottom->getHeight(); - calcPattern(vert, top, x + lw, y, w - lw - rw, th); - calcPattern(vert, bottom, x + lw, y + h - bh, w - lw - rw, bh); - calcPattern(vert, left, x, y + th, lw, h - th - bh); - if (w > rw) - calcPattern(vert, right, x + w - rw, y + th, rw, h - th - bh); -} - -calcTileVertexes(vert, topLeft, x, y); -if (topRight) -{ - const int trw = topRight->getWidth(); - if (w > trw) - calcTileVertexes(vert, topRight, x + w - trw, y); -} -if (bottomLeft) - calcTileVertexes(vert, bottomLeft, x, y + h - bottomLeft->getHeight()); -if (bottomRight) -{ - const int brw = bottomRight->getWidth(); - if (w > brw) - { - calcTileVertexes(vert, bottomRight, x + w - brw, - y + h - bottomRight->getHeight()); - } -} - -BLOCK_END("Graphics::calcImageRect") diff --git a/src/render/openglgraphics_drawImageRect.hpp b/src/render/openglgraphics_drawImageRect.hpp deleted file mode 100644 index 5c4bba0a1..000000000 --- a/src/render/openglgraphics_drawImageRect.hpp +++ /dev/null @@ -1,83 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2013 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - - -//void GraphicsX::drawImageRect(const int x, const int y, -// const int w, const int h, -// const ImageRect &imgRect) - -BLOCK_START("Graphics::drawImageRect") - -const Image *const *const grid = imgRect.grid; -const Image *const topLeft = grid[0]; -const Image *const topRight = grid[2]; -const Image *const bottomLeft = grid[6]; -const Image *const bottomRight = grid[8]; -const Image *const top = grid[1]; -const Image *const right = grid[5]; -const Image *const bottom = grid[7]; -const Image *const left = grid[3]; -const Image *const center = grid[4]; - -const bool drawMain = center && topLeft && topRight - && bottomLeft && bottomRight; - -// Draw the center area -if (center && drawMain) -{ - const int tlw = topLeft->getWidth(); - const int tlh = topLeft->getHeight(); - drawPatternInline(center, tlw + x, tlh + y, - w - tlw - topRight->getWidth(), - h - tlh - bottomLeft->getHeight()); -} - -// Draw the sides -if (top && left && bottom && right) -{ - const int lw = left->getWidth(); - const int rw = right->getWidth(); - const int th = top->getHeight(); - const int bh = bottom->getHeight(); - drawPatternInline(top, x + lw, y, w - lw - rw, th); - drawPatternInline(bottom, x + lw, h - bh + y, w - lw - rw, bh); - drawPatternInline(left, x, y + th, lw, h - th - bh); - if (w > rw) - drawPatternInline(right, x + w - rw, th + y, rw, h - th - bh); -} -// Draw the corners -if (drawMain) -{ - drawImage2(topLeft, x, y); - const int trw = topRight->getWidth(); - if (w > trw) - drawImage2(topRight, x + w - trw, y); - drawImage2(bottomLeft, x, h - bottomLeft->getHeight() + y); - const int brw = bottomRight->getWidth(); - if (w > brw) - { - drawImage2(bottomRight, - x + w - brw, - y + h - bottomRight->getHeight()); - } -} -BLOCK_END("Graphics::drawImageRect") -- cgit v1.2.3-70-g09d2