From 87236ee78078566205da2f80bd8776a336d4050a Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Mon, 30 Jan 2012 01:27:25 -0200 Subject: [PATCH] add missing shader --- modules/game_shaders/item.frag | 25 +++++++++++++++++++++++++ src/framework/net/inputmessage.h | 2 +- src/framework/net/outputmessage.h | 2 +- src/framework/net/protocol.cpp | 4 ++-- 4 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 modules/game_shaders/item.frag diff --git a/modules/game_shaders/item.frag b/modules/game_shaders/item.frag new file mode 100644 index 00000000..21b38039 --- /dev/null +++ b/modules/game_shaders/item.frag @@ -0,0 +1,25 @@ +uniform float opacity; // painter opacity +uniform vec4 color; // painter color +uniform float time; // time in seconds since shader linkage +uniform sampler2D texture; // map texture +varying vec2 textureCoords; // map texture coords + +void main() +{ + vec4 outColor = texture2D(texture, textureCoords) * opacity; + /* + float refinement = 0; + if(refinement > 0) { + vec4 sum = vec4(0.0, 0.0, 0.0, 0.0); + for(int i=-1;i<=1;++i) { + for(int j=-1;j<=1;++j) { + vec4 pixel = texture2D(texture, textureCoords + vec2(i,j)*(1.0/32.0)); + sum += pixel * (1.0/9.0) * pixel.a * (0.5 + (pixel.r + pixel.g + pixel.b)/3.0); + } + } + float factor = refinement*((1.0 + sin(time*2))/2.0); + outColor += sum * sum * factor; + } + */ + gl_FragColor = outColor; +} diff --git a/src/framework/net/inputmessage.h b/src/framework/net/inputmessage.h index 7ec65af9..31fa13d9 100644 --- a/src/framework/net/inputmessage.h +++ b/src/framework/net/inputmessage.h @@ -33,7 +33,7 @@ public: BUFFER_MAXSIZE = 16384, HEADER_POS = 0, HEADER_LENGTH = 2, - CHECKSUm_position = 2, + CHECKSUM_POS = 2, CHECKSUM_LENGTH = 4, DATA_POS = 6, UNENCRYPTED_DATA_POS = 8 diff --git a/src/framework/net/outputmessage.h b/src/framework/net/outputmessage.h index 5ce61de4..bdc72309 100644 --- a/src/framework/net/outputmessage.h +++ b/src/framework/net/outputmessage.h @@ -36,7 +36,7 @@ public: BUFFER_MAXSIZE = 1024, HEADER_POS = 0, HEADER_LENGTH = 2, - CHECKSUm_position = 2, + CHECKSUM_POS = 2, CHECKSUM_LENGTH = 4, DATA_POS = 6 }; diff --git a/src/framework/net/protocol.cpp b/src/framework/net/protocol.cpp index 0c20b765..e17471ee 100644 --- a/src/framework/net/protocol.cpp +++ b/src/framework/net/protocol.cpp @@ -71,7 +71,7 @@ void Protocol::send(OutputMessage& outputMessage) // set checksum uint32 checksum = getAdlerChecksum(outputMessage.getBuffer() + OutputMessage::DATA_POS, outputMessage.getMessageSize()); - outputMessage.setWritePos(OutputMessage::CHECKSUm_position); + outputMessage.setWritePos(OutputMessage::CHECKSUM_POS); outputMessage.addU32(checksum); // set size @@ -107,7 +107,7 @@ void Protocol::internalRecvHeader(uint8* buffer, uint16 size) void Protocol::internalRecvData(uint8* buffer, uint16 size) { - memcpy(m_inputMessage.getBuffer() + InputMessage::CHECKSUm_position, buffer, size); + memcpy(m_inputMessage.getBuffer() + InputMessage::CHECKSUM_POS, buffer, size); if(m_checksumEnabled) { uint32 checksum = getAdlerChecksum(m_inputMessage.getBuffer() + InputMessage::DATA_POS, m_inputMessage.getMessageSize() - InputMessage::CHECKSUM_LENGTH);