gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remvoe blur, fix scroll issue on win32

This commit is contained in:
Eduardo Bart 2012-03-28 15:10:59 -03:00
parent 8c2a84b6be
commit 4743763d48
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/framework/graphics/graphics.cpp
View File

@ -49,7 +49,7 @@ void Graphics::init()
#endif #endif
glEnable(GL_BLEND); glEnable(GL_BLEND);
glClear(GL_ACCUM_BUFFER_BIT); //glClear(GL_ACCUM_BUFFER_BIT);
m_emptyTexture = TexturePtr(new Texture); m_emptyTexture = TexturePtr(new Texture);
@ -83,7 +83,7 @@ bool Graphics::parseOption(const std::string& option)
void Graphics::resize(const Size& size) void Graphics::resize(const Size& size)
{ {
setViewportSize(size); setViewportSize(size);
glClear(GL_ACCUM_BUFFER_BIT); //glClear(GL_ACCUM_BUFFER_BIT);
// The projection matrix converts from Painter's coordinate system to GL's coordinate system // The projection matrix converts from Painter's coordinate system to GL's coordinate system
// * GL's viewport is 2x2, Painter's is width x height // * GL's viewport is 2x2, Painter's is width x height
@ -114,13 +114,15 @@ void Graphics::beginRender()
void Graphics::endRender() void Graphics::endRender()
{ {
// this is a simple blur effect // this is a simple blur effect
/*
static Timer timer; static Timer timer;
if(timer.ticksElapsed() >= 10) { if(timer.ticksElapsed() >= 10) {
glAccum(GL_MULT, 0.8); glAccum(GL_MULT, 0.9);
glAccum(GL_ACCUM, 0.2); glAccum(GL_ACCUM, 0.1);
timer.restart(); timer.restart();
} }
glAccum(GL_RETURN, 1); glAccum(GL_RETURN, 1);
*/
} }
void Graphics::beginClipping(const Rect& clipRect) void Graphics::beginClipping(const Rect& clipRect)

5
src/framework/platform/win32window.cpp
View File

@ -306,7 +306,7 @@ void WIN32Window::internalChooseGLVisual()
0, // No Alpha Buffer 0, // No Alpha Buffer
0, // Shift Bit Ignored 0, // Shift Bit Ignored
0, // No Accumulation Buffer 0, // No Accumulation Buffer
8, 8, 8, 8, // Accumulation Bits Ignored 0, 0, 0, 0, // Accumulation Bits Ignored
16, // 16Bit Z-Buffer (Depth Buffer) 16, // 16Bit Z-Buffer (Depth Buffer)
1, // 1Bit Stencil Buffer 1, // 1Bit Stencil Buffer
0, // No Auxiliary Buffer 0, // No Auxiliary Buffer
@ -555,8 +555,9 @@ LRESULT WIN32Window::windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
break; break;
} }
case WM_MOUSEWHEEL: { case WM_MOUSEWHEEL: {
m_inputEvent.reset(Fw::MouseWheelInputEvent);
m_inputEvent.mouseButton = Fw::MouseMidButton; m_inputEvent.mouseButton = Fw::MouseMidButton;
m_inputEvent.wheelDirection = HIWORD(wParam) > 0 ? Fw::MouseWheelUp : Fw::MouseWheelDown; m_inputEvent.wheelDirection = ((short)HIWORD(wParam)) > 0 ? Fw::MouseWheelUp : Fw::MouseWheelDown;
if(m_onInputEvent) if(m_onInputEvent)
m_onInputEvent(m_inputEvent); m_onInputEvent(m_inputEvent);
break; break;

2
src/framework/platform/x11window.cpp
View File

@ -368,10 +368,12 @@ void X11Window::internalChooseGLVisual()
GLX_RGBA, GLX_RGBA,
GLX_DOUBLEBUFFER, GLX_DOUBLEBUFFER,
GLX_STENCIL_SIZE, 1, GLX_STENCIL_SIZE, 1,
/*
GLX_ACCUM_RED_SIZE, 8, GLX_ACCUM_RED_SIZE, 8,
GLX_ACCUM_GREEN_SIZE, 8, GLX_ACCUM_GREEN_SIZE, 8,
GLX_ACCUM_BLUE_SIZE, 8, GLX_ACCUM_BLUE_SIZE, 8,
GLX_ACCUM_ALPHA_SIZE, 8, GLX_ACCUM_ALPHA_SIZE, 8,
*/
None None
}; };