From bb768f43c0d12fa0d46b2eaa666c1e3342168e6a Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Wed, 11 Jan 2012 21:00:42 -0200 Subject: [PATCH] improvments for shaders --- BUGS | 4 +++- src/framework/graphics/paintershaderprogram.cpp | 2 +- src/framework/graphics/texture.cpp | 4 ++-- src/otclient/core/game.cpp | 1 - 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/BUGS b/BUGS index 29173a85..bf0b2fc3 100644 --- a/BUGS +++ b/BUGS @@ -7,4 +7,6 @@ game map text message boxes is not displayed like tibia name/shields doesnt follow the creature when walking on parcels hotkeys wont work with caps lock hotkeys works while windows are locked, it shouldnt -some animated hits are displayed as 2 hits instead of one \ No newline at end of file +some animated hits are displayed as 2 hits instead of one +numpad on windows doesn't work correctly +skulls is rendering outside map bounds diff --git a/src/framework/graphics/paintershaderprogram.cpp b/src/framework/graphics/paintershaderprogram.cpp index d8eee627..9a79f8b7 100644 --- a/src/framework/graphics/paintershaderprogram.cpp +++ b/src/framework/graphics/paintershaderprogram.cpp @@ -36,7 +36,7 @@ bool PainterShaderProgram::link() bindUniformLocation(COLOR_UNIFORM, "color"); bindUniformLocation(OPACITY_UNIFORM, "opacity"); bindUniformLocation(TEXTURE_UNIFORM, "texture"); - bindUniformLocation(TIME_UNIFORM, "ticks"); + bindUniformLocation(TIME_UNIFORM, "time"); return true; } m_startTimer.restart(); diff --git a/src/framework/graphics/texture.cpp b/src/framework/graphics/texture.cpp index bc9f746f..0d9cd821 100644 --- a/src/framework/graphics/texture.cpp +++ b/src/framework/graphics/texture.cpp @@ -86,8 +86,8 @@ uint Texture::internalLoadGLTexture(uchar *pixels, int channels, int width, int glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_size.width(), m_size.height(), 0, format, GL_UNSIGNED_BYTE, pixels); // disable texture border - 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_S, GL_REPEAT); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); // nearest filtering (non smooth) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); diff --git a/src/otclient/core/game.cpp b/src/otclient/core/game.cpp index f6900b5f..82e9e583 100644 --- a/src/otclient/core/game.cpp +++ b/src/otclient/core/game.cpp @@ -66,7 +66,6 @@ void Game::processLoginError(const std::string& error) void Game::processConnectionError(const boost::system::error_code& error) { // connection errors only have meaning if we still have a protocol - dump << "disconnected: connection error = " << error.message(); if(m_protocolGame) { if(error != asio::error::eof) g_lua.callGlobalField("Game", "onConnectionError", error.message());