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

annotate engine/core/video/opengl/renderbackendopengl.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	46258f467c8c
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
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	24 // Platform specific includes
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	25
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	26 // 3rd party library includes
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	27 #include <SDL.h>
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	28
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	29 // FIFE includes
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	30 #include "util/base/exception.h"
642 6e2151325017 * Added the ability to query the current running screen mode prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 640 diff changeset	31 #include "util/log/logger.h"
6e2151325017 * Added the ability to query the current running screen mode prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 640 diff changeset	32 #include "video/devicecaps.h"
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	33
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	34 #include "fife_opengl.h"
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 #include "renderbackendopengl.h"
61 18c2a21ac0ad allow clients to set a custom window title and icon spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 59 diff changeset	37 #include "SDL_image.h"
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	38
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	39
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	40 namespace FIFE {
642 6e2151325017 * Added the ability to query the current running screen mode prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 640 diff changeset	41 static Logger _log(LM_VIDEO);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	42
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: 417 diff changeset	43 RenderBackendOpenGL::RenderBackendOpenGL(const SDL_Color& colorkey) : RenderBackend(colorkey) {
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	44 // Get the pixelformat we want.
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	45 SDL_Surface* testsurface = SDL_CreateRGBSurface(SDL_SWSURFACE \| SDL_SRCALPHA, 1, 1, 32,
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	46 RMASK, GMASK, BMASK ,AMASK);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	47
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	48 m_rgba_format = *(testsurface->format);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	49 SDL_FreeSurface(testsurface);
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	50 m_lightmodel = 0;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	51 m_light_enabled = false;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	52 m_stencil_enabled = false;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	53 m_alpha_enabled = false;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	54 m_sten_ref = 0;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	55 m_sten_buf = 0;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	56 m_sten_op = 0;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	57 m_sten_func = 0;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	58 m_blend_src = GL_SRC_ALPHA;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	59 m_blend_dst = GL_ONE_MINUS_SRC_ALPHA;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	60 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	61
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	62 const std::string& RenderBackendOpenGL::getName() const {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	63 static std::string backend_name = "OpenGL";
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	64 return backend_name;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	65 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	66
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	67 RenderBackendOpenGL::~RenderBackendOpenGL() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	68 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	69
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	70
640 855ad500f991 * Added the ability to set/get the video driver used using the settings interface. Note that the default driver for the OS will be used unless explicitly specified. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 634 diff changeset	71 void RenderBackendOpenGL::init(const std::string& driver) {
855ad500f991 * Added the ability to set/get the video driver used using the settings interface. Note that the default driver for the OS will be used unless explicitly specified. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 634 diff changeset	72
855ad500f991 * Added the ability to set/get the video driver used using the settings interface. Note that the default driver for the OS will be used unless explicitly specified. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 634 diff changeset	73 //note: driver has no affect on the opengl renderer so do nothing with it here.
855ad500f991 * Added the ability to set/get the video driver used using the settings interface. Note that the default driver for the OS will be used unless explicitly specified. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 634 diff changeset	74
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	75 Uint32 flags = SDL_INIT_VIDEO;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	76 if (SDL_InitSubSystem(flags) < 0)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	77 throw SDLException(SDL_GetError());
59 129d3dafd3a5 fix initialization of opengl, SDL_GL_DOUBLEBUFFER was accidently used as flag for SDL_SetVideoMode, instead it has to be used with SDL_GL_SetAttribute, thanks to austin_, who reported that. spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 46 diff changeset	78 SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	79 SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	80
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	81 SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); // temporary hack
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	82
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	83 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	84
634 5f381fa34769 * Added the clearBackBuffer() function to the renderbackends. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 633 diff changeset	85 void RenderBackendOpenGL::clearBackBuffer() {
5f381fa34769 * Added the clearBackBuffer() function to the renderbackends. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 633 diff changeset	86 GLDisable flag(GL_SCISSOR_TEST);
5f381fa34769 * Added the clearBackBuffer() function to the renderbackends. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 633 diff changeset	87 glClear(GL_COLOR_BUFFER_BIT);
5f381fa34769 * Added the clearBackBuffer() function to the renderbackends. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 633 diff changeset	88 }
5f381fa34769 * Added the clearBackBuffer() function to the renderbackends. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 633 diff changeset	89
642 6e2151325017 * Added the ability to query the current running screen mode prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 640 diff changeset	90 Image* RenderBackendOpenGL::createMainScreen(const ScreenMode& mode, const std::string& title, const std::string& icon){
61 18c2a21ac0ad allow clients to set a custom window title and icon spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 59 diff changeset	91 if(icon != "") {
18c2a21ac0ad allow clients to set a custom window title and icon spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 59 diff changeset	92 SDL_Surface *img = IMG_Load(icon.c_str());
18c2a21ac0ad allow clients to set a custom window title and icon spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 59 diff changeset	93 if(img != NULL) {
18c2a21ac0ad allow clients to set a custom window title and icon spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 59 diff changeset	94 SDL_WM_SetIcon(img, 0);
18c2a21ac0ad allow clients to set a custom window title and icon spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 59 diff changeset	95 }
18c2a21ac0ad allow clients to set a custom window title and icon spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 59 diff changeset	96 }
18c2a21ac0ad allow clients to set a custom window title and icon spq@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 59 diff changeset	97
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: 653 diff changeset	98 Image *image = setScreenMode(mode);
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: 653 diff changeset	99
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: 653 diff changeset	100 SDL_WM_SetCaption(title.c_str(), 0);
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: 653 diff changeset	101
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: 653 diff changeset	102 return image;
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: 653 diff changeset	103 }
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: 653 diff changeset	104
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: 653 diff changeset	105 Image* RenderBackendOpenGL::setScreenMode(const ScreenMode& mode) {
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: 653 diff changeset	106 uint16_t width = mode.getWidth();
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: 653 diff changeset	107 uint16_t height = mode.getHeight();
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: 653 diff changeset	108 uint16_t bitsPerPixel = mode.getBPP();
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: 653 diff changeset	109 bool fs = mode.isFullScreen();
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: 653 diff changeset	110 uint32_t flags = mode.getSDLFlags();
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: 653 diff changeset	111
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	112 SDL_Surface* screen = NULL;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	113
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: 653 diff changeset	114 if (bitsPerPixel != 0) {
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: 653 diff changeset	115 uint16_t bpp = SDL_VideoModeOK(width, height, bitsPerPixel, flags);
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: 653 diff changeset	116 if (!bpp){
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: 653 diff changeset	117 throw SDLException("Selected video mode not supported!");
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: 653 diff changeset	118 }
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: 653 diff changeset	119 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	120
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: 653 diff changeset	121 screen = SDL_SetVideoMode(width, height, bitsPerPixel, flags);
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: 653 diff changeset	122 if( !screen ) {
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: 653 diff changeset	123 throw SDLException("Unable to set video mode selected!");
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	124 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	125
642 6e2151325017 * Added the ability to query the current running screen mode prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 640 diff changeset	126 FL_LOG(_log, LMsg("RenderBackendOpenGL")
6e2151325017 * Added the ability to query the current running screen mode prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 640 diff changeset	127 << "Videomode " << width << "x" << height
6e2151325017 * Added the ability to query the current running screen mode prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 640 diff changeset	128 << " at " << int(bitsPerPixel) << " bpp");
6e2151325017 * Added the ability to query the current running screen mode prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 640 diff changeset	129
653 01acc9fc35ea * Moved getCurrentScreenMode() to the renderbackend as renderbackend is what initializes the screen. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 642 diff changeset	130 //update the screen mode with the actual flags used
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: 653 diff changeset	131 m_screenMode = ScreenMode(width,
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: 653 diff changeset	132 height,
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: 653 diff changeset	133 bitsPerPixel,
653 01acc9fc35ea * Moved getCurrentScreenMode() to the renderbackend as renderbackend is what initializes the screen. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 642 diff changeset	134 screen->flags);
01acc9fc35ea * Moved getCurrentScreenMode() to the renderbackend as renderbackend is what initializes the screen. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 642 diff changeset	135
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	136
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	137 if (!screen) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	138 throw SDLException(SDL_GetError());
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	139 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	140
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	141 glViewport(0, 0, width, height);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	142 glMatrixMode(GL_PROJECTION);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	143 gluOrtho2D(0, width, height, 0);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	144 glMatrixMode(GL_MODELVIEW);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	145
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	146 glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	147
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	148 glEnable(GL_TEXTURE_2D);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	149 glEnable(GL_BLEND);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	150 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	151
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	152 glEnable(GL_SCISSOR_TEST);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	153
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	154 glPointSize(1.0);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	155 glLineWidth(1.0);
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	156 delete m_screen;
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: 653 diff changeset	157 delete m_screen;
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	158 m_screen = new GLImage(screen);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	159 return m_screen;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	160 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	161
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: 653 diff changeset	162
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	163 void RenderBackendOpenGL::startFrame() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	164 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	165
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	166 void RenderBackendOpenGL::endFrame() {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	167 SDL_GL_SwapBuffers();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	168 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	169
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	170 Image* RenderBackendOpenGL::createImage(SDL_Surface* surface) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	171 // Given an abritary surface, we must convert it to the format GLImage will understand.
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	172 // It's easiest to let SDL do this for us.
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	173
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	174 // Uh. Gotta love this :-)
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	175 // Check for colorkey too?
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	176 // Leave out the loss/shift checks?
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	177 if( m_rgba_format.BitsPerPixel == surface->format->BitsPerPixel
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	178 && m_rgba_format.Rmask == surface->format->Rmask
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	179 && m_rgba_format.Gmask == surface->format->Gmask
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	180 && m_rgba_format.Bmask == surface->format->Bmask
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	181 && m_rgba_format.Amask == surface->format->Amask
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	182 && m_rgba_format.Rshift == surface->format->Rshift
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	183 && m_rgba_format.Gshift == surface->format->Gshift
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	184 && m_rgba_format.Bshift == surface->format->Bshift
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	185 && m_rgba_format.Ashift == surface->format->Ashift
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	186 && m_rgba_format.Rloss == surface->format->Rloss
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	187 && m_rgba_format.Gloss == surface->format->Gloss
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	188 && m_rgba_format.Bloss == surface->format->Bloss
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	189 && m_rgba_format.Aloss == surface->format->Aloss
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	190 && surface->flags & SDL_SRCALPHA ) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	191
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	192 return new GLImage(surface);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	193 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	194
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	195 SDL_Surface* conv = SDL_ConvertSurface(surface, &m_rgba_format, SDL_SWSURFACE \| SDL_SRCALPHA);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	196 GLImage* image = new GLImage(conv);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	197 SDL_FreeSurface( surface );
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	198 return image;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	199 }
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	200
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	201 Image* RenderBackendOpenGL::createImage(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	202 return new GLImage(data, width, height);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	203 }
417 14e8087cde2c Fixed the problem where the opengl renderer was leaving traces on the screen after closing maps in the editor. [t:392] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 346 diff changeset	204
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	205 void RenderBackendOpenGL::setLightingModel(unsigned int lighting) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	206 if (m_lightmodel != lighting) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	207 if (m_lightmodel == 1) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	208 disableLighting();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	209 glDisable(GL_COLOR_MATERIAL);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	210 } else if (lighting == 1) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	211 enableLighting();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	212 glEnable(GL_LIGHT0);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	213 glColorMaterial(GL_FRONT, GL_DIFFUSE);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	214 glEnable(GL_COLOR_MATERIAL);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	215 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	216 m_lightmodel = lighting;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	217 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	218 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	219
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	220 unsigned int RenderBackendOpenGL::getLightingModel() const {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	221 return m_lightmodel;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	222 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	223
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	224 void RenderBackendOpenGL::enableLighting() {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	225 if (m_lightmodel == 1 && !m_light_enabled) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	226 glEnable(GL_LIGHTING);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	227 m_light_enabled = true;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	228 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	229 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	230
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	231 void RenderBackendOpenGL::disableLighting() {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	232 if (m_lightmodel == 1 && m_light_enabled) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	233 glDisable(GL_LIGHTING);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	234 m_light_enabled = false;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	235 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	236 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	237
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	238 void RenderBackendOpenGL::setLighting(float red, float green, float blue, float alpha) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	239 if (m_lightmodel == 1) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	240 GLfloat lightDiffuse[] = {red, green, blue, alpha};
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	241 glLightfv(GL_LIGHT0, GL_DIFFUSE, lightDiffuse);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	242 } else if(m_lightmodel == 2) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	243 m_lred = red;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	244 m_lgreen = green;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	245 m_lblue = blue;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	246 m_lalpha = alpha;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	247 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	248 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	249
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	250 void RenderBackendOpenGL::resetLighting() {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	251 if (m_lightmodel == 1) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	252 setLighting(1.0, 1.0, 1.0, 1.0);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	253 } else if (m_lightmodel == 2 && m_lalpha > 0.01) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	254 uint16_t width = getScreenWidth();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	255 uint16_t height = getScreenHeight();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	256 Point p = Point(0,0);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	257 setStencilTest(0, 0, 5);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	258 fillRectangle(p, width, height, m_lred255, m_lgreen255, m_lblue255, m_lalpha255);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	259 disableStencilTest();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	260 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	261 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	262
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	263 void RenderBackendOpenGL::enableStencilTest() {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	264 if (!m_stencil_enabled) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	265 glEnable(GL_STENCIL_TEST);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	266 m_stencil_enabled = true;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	267 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	268 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	269
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	270 void RenderBackendOpenGL::disableStencilTest() {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	271 if (m_stencil_enabled) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	272 glDisable(GL_STENCIL_TEST);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	273 m_stencil_enabled = false;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	274 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	275 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	276
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	277 void RenderBackendOpenGL::setStencilTest(uint8_t stencil_ref, unsigned int stencil_op, unsigned int stencil_func) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	278 enableStencilTest();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	279 if(m_sten_op != stencil_op) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	280 GLenum op;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	281 m_sten_op = stencil_op;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	282 switch(stencil_op) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	283 default :
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	284 case 0 : op = GL_KEEP; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	285 case 1 : op = GL_ZERO; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	286 case 2 : op = GL_REPLACE; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	287 case 3 : op = GL_INCR; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	288 case 4 : op = GL_DECR; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	289 case 5 : op = GL_INVERT; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	290 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	291 glStencilOp(GL_KEEP, GL_KEEP, op);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	292 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	293
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	294 if(m_sten_ref != stencil_ref \|\| m_sten_func != stencil_func) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	295 GLenum func;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	296 m_sten_ref = stencil_ref;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	297 m_sten_func = stencil_func;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	298 switch(stencil_func) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	299 default :
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	300 case 0 : func = GL_NEVER; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	301 case 1 : func = GL_LESS; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	302 case 2 : func = GL_LEQUAL; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	303 case 3 : func = GL_GREATER; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	304 case 4 : func = GL_GEQUAL; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	305 case 5 : func = GL_EQUAL; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	306 case 6 : func = GL_NOTEQUAL; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	307 case 7 : func = GL_ALWAYS; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	308 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	309 glStencilFunc(func, stencil_ref, 0xff);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	310 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	311 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	312
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	313 void RenderBackendOpenGL::resetStencilBuffer(uint8_t buffer) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	314 if (buffer != m_sten_buf) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	315 m_sten_buf = buffer;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	316 glClearStencil(buffer);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	317 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	318 GLDisable flag(GL_SCISSOR_TEST);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	319 glClear(GL_STENCIL_BUFFER_BIT);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	320 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	321
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	322 uint8_t RenderBackendOpenGL::getStencilRef() const {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	323 return m_sten_ref;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	324 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	325
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	326 void RenderBackendOpenGL::enableAlphaTest() {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	327 if (!m_alpha_enabled) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	328 glEnable(GL_ALPHA_TEST);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	329 m_alpha_enabled = true;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	330 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	331 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	332
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	333 void RenderBackendOpenGL::disableAlphaTest() {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	334 if (m_alpha_enabled) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	335 glDisable(GL_ALPHA_TEST);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	336 m_alpha_enabled = false;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	337 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	338 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	339
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	340 void RenderBackendOpenGL::setAlphaTest(float ref_alpha) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	341 enableAlphaTest();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	342 glAlphaFunc(GL_GREATER, ref_alpha);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	343 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	344
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	345 void RenderBackendOpenGL::changeBlending(int src, int dst) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	346 GLenum src_fact;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	347 GLenum dst_fact;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	348
669 46258f467c8c * Fixed the clear screen problems. The screen is now automatically cleared every frame by the engine if there are no maps loaded. In the process I removed the setClearBackBuffer() function from the RenderBackend. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 661 diff changeset	349 switch(src) {
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	350 case 0 : src_fact = GL_ZERO; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	351 case 1 : src_fact = GL_ONE; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	352 case 2 : src_fact = GL_DST_COLOR; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	353 case 3 : src_fact = GL_ONE_MINUS_DST_COLOR; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	354 case 4 : src_fact = GL_SRC_ALPHA; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	355 case 5 : src_fact = GL_ONE_MINUS_SRC_ALPHA; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	356 case 6 : src_fact = GL_DST_ALPHA; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	357 case 7 : src_fact = GL_ONE_MINUS_DST_ALPHA; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	358
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	359 default : src_fact = GL_DST_COLOR; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	360 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	361
669 46258f467c8c * Fixed the clear screen problems. The screen is now automatically cleared every frame by the engine if there are no maps loaded. In the process I removed the setClearBackBuffer() function from the RenderBackend. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 661 diff changeset	362 switch(dst) {
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	363 case 0 : dst_fact = GL_ZERO; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	364 case 1 : dst_fact = GL_ONE; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	365 case 2 : dst_fact = GL_SRC_COLOR; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	366 case 3 : dst_fact = GL_ONE_MINUS_SRC_COLOR; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	367 case 4 : dst_fact = GL_SRC_ALPHA; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	368 case 5 : dst_fact = GL_ONE_MINUS_SRC_ALPHA; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	369 case 6 : dst_fact = GL_DST_ALPHA; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	370 case 7 : dst_fact = GL_ONE_MINUS_DST_ALPHA; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	371
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	372 default : dst_fact = GL_SRC_ALPHA; break;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	373 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	374
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	375 if (m_blend_src != src_fact \|\| m_blend_dst != dst_fact) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	376 m_blend_src = src_fact;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	377 m_blend_dst = dst_fact;
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	378 glBlendFunc(src_fact, dst_fact);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	379 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	380 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	381
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: 579 diff changeset	382 bool RenderBackendOpenGL::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	383 if ((x < 0) \|\| (x >= (int)getWidth()) \|\| (y < 0) \|\| (y >= (int)getHeight())) {
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	384 return false;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	385 }
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: 579 diff changeset	386
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: 579 diff changeset	387 glColor4ub(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: 579 diff changeset	388
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	389 glBegin(GL_POINTS);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	390 glVertex2i(x, y);
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	391 glEnd();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	392 return true;
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	393 }
417 14e8087cde2c Fixed the problem where the opengl renderer was leaving traces on the screen after closing maps in the editor. [t:392] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 346 diff changeset	394
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: 579 diff changeset	395 void RenderBackendOpenGL::drawLine(const Point& p1, const Point& p2, 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: 579 diff changeset	396 glColor4ub(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: 579 diff changeset	397
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	398 glBegin(GL_LINES);
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	399 glVertex2f(p1.x+0.5f, p1.y+0.5f);
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	400 glVertex2f(p2.x+0.5f, p2.y+0.5f);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	401 glEnd();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	402
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	403 glBegin(GL_POINTS);
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	404 glVertex2f(p2.x+0.5f, p2.y+0.5f);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	405 glEnd();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	406 }
417 14e8087cde2c Fixed the problem where the opengl renderer was leaving traces on the screen after closing maps in the editor. [t:392] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 346 diff changeset	407
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: 579 diff changeset	408 void RenderBackendOpenGL::drawTriangle(const Point& p1, const Point& p2, const Point& p3, 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: 579 diff changeset	409 glColor4ub(r, g, b, a);
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: 583 diff changeset	410
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: 579 diff changeset	411 glBegin(GL_TRIANGLES);
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: 579 diff changeset	412 glVertex2f(p1.x, p1.y);
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: 579 diff changeset	413 glVertex2f(p2.x, p2.y);
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: 579 diff changeset	414 glVertex2f(p3.x, p3.y);
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: 579 diff changeset	415 glEnd();
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: 579 diff changeset	416 }
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: 579 diff changeset	417
631 f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	418 void RenderBackendOpenGL::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: 620 diff changeset	419 glColor4ub(r, g, b, a);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	420
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	421 glBegin(GL_LINE_LOOP);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	422 glVertex2f(p.x, p.y);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	423 glVertex2f(p.x+w, p.y);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	424 glVertex2f(p.x+w, p.y+h);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	425 glVertex2f(p.x, p.y+h);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	426 glEnd();
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	427 }
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	428
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	429 void RenderBackendOpenGL::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: 620 diff changeset	430 glColor4ub(r, g, b, a);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	431
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	432 glBegin(GL_QUADS);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	433 glVertex2f(p.x, p.y);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	434 glVertex2f(p.x+w, p.y);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	435 glVertex2f(p.x+w, p.y+h);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	436 glVertex2f(p.x, p.y+h);
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	437 glEnd();
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	438 }
f3457443c95f * Added drawRectangle() and fillRectangle() functions to the renderers prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 620 diff changeset	439
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: 579 diff changeset	440 void RenderBackendOpenGL::drawQuad(const Point& p1, const Point& p2, const Point& p3, const Point& p4, 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: 579 diff changeset	441 glColor4ub(r, g, b, a);
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: 583 diff changeset	442
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	443 glBegin(GL_QUADS);
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	444 glVertex2f(p1.x, p1.y);
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	445 glVertex2f(p2.x, p2.y);
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	446 glVertex2f(p3.x, p3.y);
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	447 glVertex2f(p4.x, p4.y);
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	448 glEnd();
4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	449 }
417 14e8087cde2c Fixed the problem where the opengl renderer was leaving traces on the screen after closing maps in the editor. [t:392] prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 346 diff changeset	450
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: 579 diff changeset	451 void RenderBackendOpenGL::drawVertex(const Point& p, const uint8_t size, 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	452 GLfloat width;
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	453 glGetFloatv(GL_LINE_WIDTH, &width);
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	454 glLineWidth(1.0);
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	455
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: 579 diff changeset	456 glColor4ub(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: 579 diff changeset	457
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	458 glBegin(GL_LINE_LOOP);
579 b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	459 glVertex2f(p.x-size, p.y+size);
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	460 glVertex2f(p.x+size, p.y+size);
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	461 glVertex2f(p.x+size, p.y-size);
b2feacaed53c * Added the colorbuffer patch with a small change due to SDL. Performance boost between 20-30% under OpenGL. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 430 diff changeset	462 glVertex2f(p.x-size, p.y-size);
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	463 glEnd();
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	464
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	465 glLineWidth(width);
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	466 }
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	467
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	468 void RenderBackendOpenGL::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	469 glBegin(GL_TRIANGLE_FAN);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	470 glColor4ub(red, green, blue, intensity);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	471 glVertex2f(p.x, p.y);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	472 if (m_lightmodel == 2) {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	473 glColor4ub(0, 0, 0, intensity);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	474 } else {
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	475 glColor4ub(0, 0, 0, 255);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	476 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	477 for(float angle=0; angle<=Mathf::twoPi(); angle+=(Mathf::twoPi()/subdivisions)){
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	478 glVertex2f( radiusMathf::Cos(angle)xstretch + p.x,
669 46258f467c8c * Fixed the clear screen problems. The screen is now automatically cleared every frame by the engine if there are no maps loaded. In the process I removed the setClearBackBuffer() function from the RenderBackend. prock@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 661 diff changeset	479 radiusMathf::Sin(angle)ystretch + p.y);
661 e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	480 }
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	481 glVertex2f(p.x+radius*xstretch, p.y);
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	482 glEnd();
e3140f01749d * Merged the light branch back into trunk. helios2000@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 654 diff changeset	483 }
0 4a0efb7baf70 * Datasets becomes the new trunk and retires after that :-) mvbarracuda@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	484 }

Mercurial > fife-parpg

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