FBO, game states

This commit is contained in:
Eduardo Bart 2010-11-23 13:30:43 -02:00
parent f10ced4626
commit 4b2886ebec
14 changed files with 425 additions and 30 deletions

View File

@ -50,6 +50,8 @@ ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
# find sources # find sources
SET(SOURCES SET(SOURCES
src/menustate.cpp
src/framebuffer.cpp
src/textureloader.cpp src/textureloader.cpp
src/texture.cpp src/texture.cpp
src/texturemanager.cpp src/texturemanager.cpp

View File

@ -29,13 +29,15 @@
#include "input.h" #include "input.h"
#include "configmanager.h" #include "configmanager.h"
#include "logger.h" #include "logger.h"
#include "gamestate.h"
Engine g_engine; Engine g_engine;
Engine::Engine() : Engine::Engine() :
m_stopping(false), m_stopping(false),
m_running(false), m_running(false),
m_lastFrameTicks(0) m_lastFrameTicks(0),
m_currentState(NULL)
{ {
} }
@ -108,20 +110,32 @@ void Engine::stop()
m_stopping = true; m_stopping = true;
} }
void Engine::changeState(GameState* newState)
{
if(m_currentState)
m_currentState->onLeave();
m_currentState = newState;
m_currentState->onEnter();
}
void Engine::render() void Engine::render()
{ {
g_graphics.beginRender(); g_graphics.beginRender();
if(m_currentState)
m_currentState->render();
g_graphics.endRender(); g_graphics.endRender();
} }
void Engine::update(int elapsedTicks) void Engine::update(int elapsedTicks)
{ {
if(m_currentState)
m_currentState->update(elapsedTicks);
} }
void Engine::onClose() void Engine::onClose()
{ {
stop(); if(m_currentState)
m_currentState->onClose();
} }
void Engine::onResize(int width, int height) void Engine::onResize(int width, int height)
@ -131,5 +145,6 @@ void Engine::onResize(int width, int height)
void Engine::onInputEvent(InputEvent *event) void Engine::onInputEvent(InputEvent *event)
{ {
if(m_currentState)
m_currentState->onInputEvent(event);
} }

View File

@ -27,6 +27,8 @@
struct InputEvent; struct InputEvent;
class GameState;
class Engine class Engine
{ {
public: public:
@ -38,8 +40,13 @@ public:
/// Main loop /// Main loop
void run(); void run();
/// Stops main loop
void stop(); void stop();
/// Change current game state
void changeState(GameState *newState);
bool isRunning() const { return m_running; } bool isRunning() const { return m_running; }
bool isStopping() const { return m_stopping; } bool isStopping() const { return m_stopping; }
@ -60,6 +67,8 @@ private:
bool m_running; bool m_running;
unsigned long m_lastFrameTicks; unsigned long m_lastFrameTicks;
GameState *m_currentState;
}; };
extern Engine g_engine; extern Engine g_engine;

120
src/framebuffer.cpp Normal file
View File

@ -0,0 +1,120 @@
/* The MIT License
*
* Copyright (c) 2010 OTClient, https://github.com/edubart/otclient
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#define GL_GLEXT_PROTOTYPES
#include "framebuffer.h"
#include <GL/glext.h>
#include <GL/glu.h>
#include "platform.h"
#include "graphics.h"
FrameBuffer::FrameBuffer(int width, int height) :
m_fbo(0)
{
m_width = width;
m_height = height;
// texture where the framebuffer will be store
m_frameTexture = TexturePtr(new Texture(width, height, 4));
// we want a smooth framebuffer
m_frameTexture->enableBilinearFilter();
// use FBO only if supported
if(Platform::isExtensionSupported("EXT_framebuffer_object")) {
m_fallbackOldImp = false;
// generate FBO
glGenFramebuffersEXT(1, &m_fbo);
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
// attach 2D texture to this FBO
glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_frameTexture->getTextureId(), 0);
// must be called before checking
glDrawBuffer(GL_NONE);
glReadBuffer(GL_NONE);
GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
switch(status) {
case GL_FRAMEBUFFER_COMPLETE_EXT:
//ok
break;
default:
m_fallbackOldImp = true;
break;
}
} else {
// otherwise fallback to copy texture from screen implementation
m_fallbackOldImp = true;
}
}
FrameBuffer::~FrameBuffer()
{
if(m_fbo)
glDeleteFramebuffersEXT(1, &m_fbo);
}
void FrameBuffer::bind()
{
if(!m_fallbackOldImp) {
// bind framebuffer
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
// must be called before rendering to framebuffer
glDrawBuffer(GL_NONE);
glReadBuffer(GL_NONE);
}
// clear framebuffer
glClearColor(0.0, 0.0, 0.0, 0.0);
glClear(GL_COLOR_BUFFER_BIT);
// setup framebuffer viewport
g_graphics.setViewport(m_width, m_height);
}
void FrameBuffer::unbind()
{
if(!m_fallbackOldImp) {
// bind back buffer again
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
// must be called to render to back buffer again
glDrawBuffer(GL_BACK);
glReadBuffer(GL_BACK);
} else {
// copy screen to texture
m_frameTexture->copyFromScreen(0, 0, 0, 0, m_width, m_height);
// clear screen
glClearColor(0.0, 0.0, 0.0, 0.0);
glClear(GL_COLOR_BUFFER_BIT);
}
// restore graphics viewport
g_graphics.restoreViewport();
}

52
src/framebuffer.h Normal file
View File

@ -0,0 +1,52 @@
/* The MIT License
*
* Copyright (c) 2010 OTClient, https://github.com/edubart/otclient
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef FRAMEBUFFER_H
#define FRAMEBUFFER_H
#include "texture.h"
class FrameBuffer
{
FrameBuffer(int width, int height);
virtual ~FrameBuffer();
/// Return the texture where everything was drawn
TexturePtr getFramebufferTexture();
/// Bind the framebuffer, everything rendered will be draw on it
void bind();
/// Unbind the framebuffer, render on back buffer again
void unbind();
private:
TexturePtr m_frameTexture;
GLuint m_fbo;
bool m_fallbackOldImp;
int m_width;
int m_height;
};
#endif // FRAMEBUFFER_H

46
src/gamestate.h Normal file
View File

@ -0,0 +1,46 @@
/* The MIT License
*
* Copyright (c) 2010 OTClient, https://github.com/edubart/otclient
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef GAMESTATE_H
#define GAMESTATE_H
struct InputEvent;
class GameState
{
public:
GameState() { }
virtual ~GameState() { }
virtual void onEnter() = 0;
virtual void onLeave() = 0;
virtual void onClose() = 0;
virtual void onInputEvent(InputEvent *event) = 0;
virtual void render() = 0;
virtual void update(int elapsedTicks) = 0;
};
#endif // GAMESTATE_H

View File

@ -24,11 +24,9 @@
#include "graphics.h" #include "graphics.h"
#include "logger.h" #include "logger.h"
#include "texturemanager.h"
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#include "platform.h"
Graphics g_graphics; Graphics g_graphics;
@ -60,12 +58,19 @@ void Graphics::terminate()
} }
void Graphics::resize(int width, int height) void Graphics::resize(int width, int height)
{
m_width = width;
m_height = height;
restoreViewport();
}
void Graphics::setViewport(int width, int height)
{ {
// resize gl viewport // resize gl viewport
glViewport(0, 0, width, height); glViewport(0, 0, width, height);
/* /*
0,0---------0,w 0 ,0---------0,w**
| | | |
| | | |
| | | |

View File

@ -42,6 +42,19 @@ public:
/// Called after every render /// Called after every render
void endRender(); void endRender();
/// Restore original viewport
void restoreViewport() { setViewport(m_width, m_height); }
/// Set viewport, used by FrameBuffer
void setViewport(int width, int height);
int getWidth() { return m_width; }
int getHeight() { return m_height; }
private:
int m_width;
int m_height;
}; };
extern Graphics g_graphics; extern Graphics g_graphics;

View File

@ -28,9 +28,12 @@
#include "configmanager.h" #include "configmanager.h"
#include "resourcemanager.h" #include "resourcemanager.h"
#include "platform.h" #include "platform.h"
#include "menustate.h"
#include <csignal> #include <csignal>
#include <boost/scoped_ptr.hpp>
/// Catches signals so we can exit nicely /// Catches signals so we can exit nicely
void signal_handler(int sig) void signal_handler(int sig)
{ {
@ -77,9 +80,17 @@ int main(int argc, const char *argv[])
notice(APP_LONGNAME); notice(APP_LONGNAME);
// setup the engine and run // setup the engine
g_engine.init(); g_engine.init();
// create initial state
boost::scoped_ptr<MenuState> menuState(new MenuState);
g_engine.changeState(menuState.get());
// run
g_engine.run(); g_engine.run();
// terminate stuff
g_engine.terminate(); g_engine.terminate();
// save configurations before exiting // save configurations before exiting

67
src/menustate.cpp Normal file
View File

@ -0,0 +1,67 @@
/* The MIT License
*
* Copyright (c) 2010 OTClient, https://github.com/edubart/otclient
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "menustate.h"
#include "framebuffer.h"
#include "graphics.h"
#include "texturemanager.h"
MenuState::MenuState()
{
}
MenuState::~MenuState()
{
}
void MenuState::onEnter()
{
}
void MenuState::onLeave()
{
}
void MenuState::onClose()
{
}
void MenuState::onInputEvent(InputEvent* event)
{
}
void MenuState::render()
{
}
void MenuState::update(int elapsedTicks)
{
}

47
src/menustate.h Normal file
View File

@ -0,0 +1,47 @@
/* The MIT License
*
* Copyright (c) 2010 OTClient, https://github.com/edubart/otclient
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef MENUSTATE_H
#define MENUSTATE_H
#include "gamestate.h"
class MenuState : public GameState
{
public:
MenuState();
virtual ~MenuState();
void onEnter();
void onLeave();
void onClose();
void onInputEvent(InputEvent *event);
void render();
void update(int elapsedTicks);
};
#endif // MENUSTATE_H

View File

@ -27,14 +27,13 @@
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
Texture::Texture(int width, int height, unsigned char *pixels, int components) Texture::Texture(int width, int height, int components, unsigned char *pixels)
{ {
m_width = width; m_width = width;
m_height = height; m_height = height;
glGenTextures(1, &m_textureId); glGenTextures(1, &m_textureId);
glBindTexture(GL_TEXTURE_2D, m_textureId); glBindTexture(GL_TEXTURE_2D, m_textureId);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
GLenum format = 0; GLenum format = 0;
switch(components) { switch(components) {
@ -54,9 +53,6 @@ Texture::Texture(int width, int height, unsigned char *pixels, int components)
glTexImage2D(GL_TEXTURE_2D, 0, components, width, height, 0, format, GL_UNSIGNED_BYTE, pixels); glTexImage2D(GL_TEXTURE_2D, 0, components, width, height, 0, format, GL_UNSIGNED_BYTE, pixels);
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &height);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
@ -70,14 +66,21 @@ Texture::~Texture()
glDeleteTextures(1, &m_textureId); glDeleteTextures(1, &m_textureId);
} }
void Texture::enableBilinearFilter()
{
glBindTexture(GL_TEXTURE_2D, m_textureId);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}
void Texture::bind() void Texture::bind()
{ {
glBindTexture(GL_TEXTURE_2D, m_textureId); glBindTexture(GL_TEXTURE_2D, m_textureId);
} }
void Texture::enableBilinearFilter()
{
bind();
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
}
void Texture::copyFromScreen(int xoffset, int yoffset, int x, int y, int width, int height)
{
bind();
glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, width, height);
}

View File

@ -33,7 +33,8 @@ class TextureManager;
class Texture class Texture
{ {
public: public:
Texture(int width, int height, unsigned char *pixels, int components); /// Create a texture, width and height must be a multiple of 2
Texture(int width, int height, int components, unsigned char *pixels = NULL);
virtual ~Texture(); virtual ~Texture();
/// Bind texture for drawing /// Bind texture for drawing
@ -42,8 +43,12 @@ public:
/// Enable texture bilinear filter (smooth scaled textures) /// Enable texture bilinear filter (smooth scaled textures)
void enableBilinearFilter(); void enableBilinearFilter();
/// Copy screen pixels to texture
void copyFromScreen(int xoffset, int yoffset, int x, int y, int width, int height);
int getWidth() const { return m_width; } int getWidth() const { return m_width; }
int getHeight() const { return m_height; } int getHeight() const { return m_height; }
GLuint getTextureId() const { return m_textureId; }
private: private:
GLuint m_textureId; GLuint m_textureId;

View File

@ -117,7 +117,7 @@ TexturePtr TextureLoader::loadPNG(const unsigned char *fileData, unsigned int fi
fclose(pngFile); fclose(pngFile);
delete[] row_pointers; delete[] row_pointers;
texture = TexturePtr(new Texture(width, height, pixels, components)); texture = TexturePtr(new Texture(width, height, components, pixels));
delete[] pixels; delete[] pixels;