Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github:jpfau/legesmotus

  • Loading branch information...
commit e678f78f30e1ead971133fe623b0fd35d89546a7 2 parents 3a5400a + 17c9209
@endrift authored
Showing with 4 additions and 4 deletions.
  1. +1 −1  common/file.cpp
  2. +3 −3 data/shaders/gl/blur.frag
View
2  common/file.cpp
@@ -116,7 +116,7 @@ const char* LM::user_dir() {
if (SUCCEEDED(err)) {
dir = path;
dir += "\\Leges Motus\\";
- if (!CreateDirectory(cfg.c_str(), NULL)) {
+ if (!CreateDirectory(dir.c_str(), NULL)) {
if (GetLastError() != ERROR_ALREADY_EXISTS) {
WARN("Couldn't create config directory");
}
View
6 data/shaders/gl/blur.frag
@@ -3,8 +3,8 @@ uniform float d;
uniform int ksize;
void main() {
- vec4 csum;
- float sum;
+ vec4 csum = vec4(0.0, 0.0, 0.0, 0.0);
+ float sum = 0.0;
vec2 t = gl_TexCoord[0].st;
for (int i = 0; i < ksize; ++i) {
for (int j = 0; j < ksize; ++j) {
@@ -17,4 +17,4 @@ void main() {
}
csum /= sum;
gl_FragColor = gl_Color*vec4(csum.r/csum.a, csum.g/csum.a, csum.b/csum.a, csum.a);
-}
+}
Please sign in to comment.
Something went wrong with that request. Please try again.