fife-parpg: engine/core/video/opengl/glimage.cpp annotate

annotate engine/core/video/opengl/glimage.cpp @ 697:ecaa4d98f05f tip

Abstracted the GUI code and refactored the GUIChan-specific code into its own module. * Most of the GUIChan code has been refactored into its own gui/guichan module. However, references to the GuiFont class still persist in the Engine and GuiManager code and these will need further refactoring. * GuiManager is now an abstract base class which specific implementations (e.g. GUIChan) should subclass. * The GUIChan GUI code is now a concrete implementation of GuiManager, most of which is in the new GuiChanGuiManager class. * The GUI code in the Console class has been refactored out of the Console and into the GUIChan module as its own GuiChanConsoleWidget class. The rest of the Console class related to executing commands was left largely unchanged. * Existing client code may need to downcast the GuiManager pointer received from FIFE::Engine::getGuiManager() to GuiChanGuiManager, since not all functionality is represented in the GuiManager abstract base class. Python client code can use the new GuiChanGuiManager.castTo static method for this purpose.

author	M. George Hansen <technopolitica@gmail.com>
date	Sat, 18 Jun 2011 00:28:40 -1000
parents	e3140f01749d
children

rev	line source
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	1 /***************************************************************************
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	2 * Copyright (C) 2005-2008 by the FIFE team *
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	3 * http://www.fifengine.de *
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	4 * This file is part of FIFE. *
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	5 * *
46 90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	6 * FIFE is free software; you can redistribute it and/or *
90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	7 * modify it under the terms of the GNU Lesser General Public *
90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	8 * License as published by the Free Software Foundation; either *
90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	9 * version 2.1 of the License, or (at your option) any later version. *
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	10 * *
46 90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	11 * This library is distributed in the hope that it will be useful, *
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	12 * but WITHOUT ANY WARRANTY; without even the implied warranty of *
46 90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	14 * Lesser General Public License for more details. *
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	15 * *
46 90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	16 * You should have received a copy of the GNU Lesser General Public *
90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	17 * License along with this library; if not, write to the *
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	18 * Free Software Foundation, Inc., *
46 90005975cdbb * Final LGPL switch step by adjusting the file headers mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 0 diff changeset	19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	20 ***************************************************************************/
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	21
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	22 // Standard C++ library includes
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	23 #include <cassert>
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	24 #include <iostream>
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	25 // 3rd party library includes
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	26
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	27 // FIFE includes
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	28 // These includes are split up in two parts, separated by one empty line
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	29 // First block: files included from the FIFE root src directory
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	30 // Second block: files included from the same folder
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	31 #include "util/structures/rect.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	32 #include "video/sdl/sdlimage.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	33 #include "video/renderbackend.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	34
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	35 #include "glimage.h"
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	36
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	37 namespace FIFE {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	38 GLImage::GLImage(SDL_Surface* surface):
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	39 Image(surface) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	40 m_sdlimage = new SDLImage(surface);
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	41
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	42 m_textureids = NULL;
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	43
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	44 resetGlimage();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	45 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	46
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	47 GLImage::GLImage(const uint8_t* data, unsigned int width, unsigned int height):
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	48 Image(data, width, height) {
627 79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	49 assert(m_surface);
79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	50 m_sdlimage = new SDLImage(m_surface);
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	51
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	52 m_textureids = NULL;
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	53
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	54 resetGlimage();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	55 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	56
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	57 GLImage::~GLImage() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	58 // remove surface so that deletion happens correctly (by base class destructor)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	59 m_sdlimage->detachSurface();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	60 delete m_sdlimage;
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	61
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	62 cleanup();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	63 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	64
654 5d6b1820b953 * Added the ability to change screen modes on the fly. This works both in OpenGL and SDL modes. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 631 diff changeset	65 void GLImage::invalidate() {
5d6b1820b953 * Added the ability to change screen modes on the fly. This works both in OpenGL and SDL modes. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 631 diff changeset	66 resetGlimage();
5d6b1820b953 * Added the ability to change screen modes on the fly. This works both in OpenGL and SDL modes. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 631 diff changeset	67 }
5d6b1820b953 * Added the ability to change screen modes on the fly. This works both in OpenGL and SDL modes. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 631 diff changeset	68
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	69 void GLImage::resetGlimage() {
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	70 cleanup();
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	71
627 79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	72 m_chunk_size_w = 0;
79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	73 m_chunk_size_h = 0;
79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	74
425 ad7969d9460b A client can now specify a global color key to be used with all images. The default color key is (255,0,255) in RGB format. Also the client can enable/disable the color key feature by using the setColorKeyEnabled function in the EngineSettings class. By default the color key feature is disabled. fixes[t:451] vtchill@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 263 diff changeset	75 m_colorkey = RenderBackend::instance()->getColorKey();
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	76 }
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	77
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	78 void GLImage::cleanup() {
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	79 if (m_textureids) {
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	80 glDeleteTextures(1, &m_textureids[0]);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	81
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	82 delete[] m_textureids;
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	83 m_textureids = NULL;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	84 }
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	85
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	86 m_col_tex_coord = 0;
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	87 m_row_tex_coord = 0;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	88 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	89
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	90 void GLImage::render(const Rect& rect, SDL_Surface* screen, unsigned char alpha) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	91 if (!m_textureids) {
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	92 generateGLTexture();
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	93 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	94
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	95 //not on the screen. dont render
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	96 if (rect.right() < 0 \|\| rect.x > static_cast<int>(screen->w) \|\| rect.bottom() < 0 \|\| rect.y > static_cast<int>(screen->h)) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	97 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	98 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	99
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	100 //completely transparent so dont bother rendering
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	101 if (0 == alpha) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	102 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	103 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	104
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	105 // the amount of "zooming" for the image
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	106 float scale_x = static_cast<float>(rect.w) / static_cast<float>(m_surface->w);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	107 float scale_y = static_cast<float>(rect.h) / static_cast<float>(m_surface->h);
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	108
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	109 // apply the scale to the width and height of the image
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	110 uint16_t w = static_cast<int>(round(scale_x*m_surface->w));
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	111 uint16_t h = static_cast<int>(round(scale_y*m_surface->h));
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	112
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	113 // setting transparency for the whole primitive:
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	114 glColor4ub( 255, 255, 255, alpha );
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	115
625 92290efadab7 * This fixes a small bug that causes some primitives to not be rendered by the OpenGL renderbackend prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	116 glEnable(GL_TEXTURE_2D);
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	117 glBindTexture(GL_TEXTURE_2D, m_textureids[0]);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	118
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	119 glBegin(GL_QUADS);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	120 glTexCoord2f(0.0f, 0.0f);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	121 glVertex2i(rect.x, rect.y);
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	122
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	123 glTexCoord2f(0.0f, m_row_tex_coord);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	124 glVertex2i(rect.x, rect.y + h);
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	125
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	126 glTexCoord2f(m_col_tex_coord, m_row_tex_coord);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	127 glVertex2i(rect.x + w, rect.y + h);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	128
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	129 glTexCoord2f(m_col_tex_coord, 0.0f);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	130 glVertex2i(rect.x + w, rect.y);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	131 glEnd();
625 92290efadab7 * This fixes a small bug that causes some primitives to not be rendered by the OpenGL renderbackend prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	132 glDisable(GL_TEXTURE_2D);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	133
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	134 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	135
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	136 void GLImage::generateGLTexture() {
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	137 const unsigned int width = m_surface->w;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	138 const unsigned int height = m_surface->h;
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	139
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	140 //calculate the nearest larger power of 2
627 79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	141 m_chunk_size_w = nextPow2(width);
79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	142 m_chunk_size_h = nextPow2(height);
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	143
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	144 // used to calculate the fill ratio for given chunk
627 79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	145 m_col_tex_coord = static_cast<float>(m_surface->w%m_chunk_size_w) / static_cast<float>(m_chunk_size_w);
79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	146 m_row_tex_coord = static_cast<float>(m_surface->h%m_chunk_size_h) / static_cast<float>(m_chunk_size_h);
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	147
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	148 if (m_col_tex_coord == 0.0f){
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	149 m_col_tex_coord = 1.0f;
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	150 }
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	151
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	152 if (m_row_tex_coord == 0.0f){
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	153 m_row_tex_coord = 1.0f;
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	154 }
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	155
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	156 uint8_t* data = static_cast<uint8_t*>(m_surface->pixels);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	157 int pitch = m_surface->pitch;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	158
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	159
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	160 assert(!m_textureids);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	161
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	162 m_textureids = new GLuint[1];
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	163 memset(m_textureids, 0x00, 1*sizeof(GLuint));
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	164
263 10e0687a4cec Fixed a bug in the OpenGl renderer where the last chunk of images would not be displayed when image_height % chunk_size was 0. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 46 diff changeset	165
627 79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	166 uint32_t* oglbuffer = new uint32_t[m_chunk_size_w * m_chunk_size_h];
79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	167 memset(oglbuffer, 0x00, m_chunk_size_wm_chunk_size_hsizeof(uint32_t));
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	168
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	169 for (unsigned int y = 0; y < height; ++y) {
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	170 for (unsigned int x = 0; x < width; ++x) {
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	171 unsigned int pos = (y * pitch) + (x * 4);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	172
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	173 uint8_t r = data[pos + 3];
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	174 uint8_t g = data[pos + 2];
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	175 uint8_t b = data[pos + 1];
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	176 uint8_t a = data[pos + 0];
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	177
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	178 if (RenderBackend::instance()->isColorKeyEnabled()) {
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	179 // only set alpha to zero if colorkey feature is enabled
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	180 if (r == m_colorkey.r && g == m_colorkey.g && b == m_colorkey.b) {
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	181 a = 0;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	182 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	183 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	184
627 79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	185 oglbuffer[(y*m_chunk_size_w) + x] = r \| (g << 8) \| (b << 16) \| (a<<24);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	186 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	187 }
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	188
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	189 // get texture id from opengl
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	190 glGenTextures(1, &m_textureids[0]);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	191 // set focus on that texture
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	192 glBindTexture(GL_TEXTURE_2D, m_textureids[0]);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	193 // set filters for texture
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	194 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	195 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	196 // transfer data from sdl buffer
627 79257869a6e9 * GLImage now uses the optimal next power of 2 size for both width and height. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 625 diff changeset	197 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, m_chunk_size_w, m_chunk_size_h, 0, GL_RGBA, GL_UNSIGNED_BYTE, static_cast<GLvoid*>(oglbuffer));
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	198
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	199 delete[] oglbuffer;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	200 }
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	201
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	202 void GLImage::saveImage(const std::string& filename) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	203 const unsigned int swidth = getWidth();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	204 const unsigned int sheight = getHeight();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	205 SDL_Surface *surface = NULL;
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	206 uint8_t *pixels;
ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	207
ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	208 surface = SDL_CreateRGBSurface(SDL_SWSURFACE, swidth,
ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	209 sheight, 24,
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	210 RMASK,GMASK,BMASK, NULLMASK);
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	211
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	212 if(surface == NULL) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	213 return;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	214 }
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	215
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	216 SDL_LockSurface(surface);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	217 pixels = new uint8_t[swidth * sheight * 3];
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	218 glReadPixels(0, 0, swidth, sheight, GL_RGB, GL_UNSIGNED_BYTE, reinterpret_cast<GLvoid*>(pixels));
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	219
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	220 uint8_t imagepixels = reinterpret_cast<uint8_t>(surface->pixels);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	221 // Copy the "reversed_image" memory to the "image" memory
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	222 for (int y = (sheight - 1); y >= 0; --y) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	223 uint8_t rowbegin = pixels + y swidth * 3;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	224 uint8_t rowend = rowbegin + swidth 3;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	225
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	226 std::copy(rowbegin, rowend, imagepixels);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	227
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	228 // Advance a row in the output surface.
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	229 imagepixels += surface->pitch;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	230 }
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	231
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	232 SDL_UnlockSurface(surface);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	233 saveAsPng(filename, *surface);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	234 SDL_FreeSurface(surface);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	235 delete [] pixels;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	236 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	237
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	238 void GLImage::setClipArea(const Rect& cliparea, bool clear) {
620 853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	239 glScissor(cliparea.x, getHeight() - cliparea.y - cliparea.h, cliparea.w, cliparea.h);
853d25234671 * Moved the GLEnable and GLDisable structures from opengl_gui_graphics.cpp to fife_opengl.h as they may prove to be useful elsewhere. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 603 diff changeset	240
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	241 if (clear) {
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	242 glClear(GL_COLOR_BUFFER_BIT);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	243 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	244 }
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	245
583 47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	246 bool GLImage::putPixel(int x, int y, int r, int g, int b, int a) {
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	247 cleanup();
583 47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	248 return m_sdlimage->putPixel(x, y, r, g, b, a);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	249 }
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	250
583 47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	251 void GLImage::drawLine(const Point& p1, const Point& p2, int r, int g, int b, int a) {
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	252 cleanup();
583 47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	253 m_sdlimage->drawLine(p1, p2, r, g, b, a);
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	254 }
ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	255
583 47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	256 void GLImage::drawTriangle(const Point& p1, const Point& p2, const Point& p3, int r, int g, int b, int a) {
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	257 cleanup();
583 47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	258 m_sdlimage->drawTriangle(p1, p2, p3, r, g, b, a);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	259 }
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	260
631 f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 627 diff changeset	261 void GLImage::drawRectangle(const Point& p, uint16_t w, uint16_t h, uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 627 diff changeset	262 cleanup();
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 627 diff changeset	263 m_sdlimage->drawRectangle(p, w, h, r, g, b, a);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 627 diff changeset	264 }
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 627 diff changeset	265
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 627 diff changeset	266 void GLImage::fillRectangle(const Point& p, uint16_t w, uint16_t h, uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 627 diff changeset	267 cleanup();
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 627 diff changeset	268 m_sdlimage->fillRectangle(p, w, h, r, g, b, a);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 627 diff changeset	269 }
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 627 diff changeset	270
583 47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	271 void GLImage::drawQuad(const Point& p1, const Point& p2, const Point& p3, const Point& p4, int r, int g, int b, int a) {
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	272 cleanup();
583 47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	273 m_sdlimage->drawQuad(p1, p2, p3, p4, r, g, b, a);
47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	274 }
47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	275
47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	276 void GLImage::drawVertex(const Point& p, const uint8_t size, int r, int g, int b, int a) {
47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	277 cleanup();
47b49b9b0c0a * Improved the floatingtextrenderer. Now you can set an alpha value for font, background quad and border. Splited quad and border into own commands. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	278 m_sdlimage->drawVertex(p, size, r, g, b, a);
430 ad1f09d954f9 Added the ability to render a vertex on the screen. The vertex is represented by a small square. fixes[t:455] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 425 diff changeset	279 }
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	280
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	281 void GLImage::drawLightPrimitive(const Point& p, uint8_t intensity, float radius, int subdivisions, float xstretch, float ystretch, uint8_t red, uint8_t green, uint8_t blue) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	282 cleanup();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	283 m_sdlimage->drawLightPrimitive(p, intensity, radius, subdivisions, xstretch, ystretch, red, green, blue);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	284 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	285 }

Mercurial > fife-parpg

annotate engine/core/video/opengl/glimage.cpp @ 697:ecaa4d98f05f tip