dmuratshin 9 years ago
parent
commit
9410be69b5
2 changed files with 4 additions and 3 deletions
  1. 2 2
      oxygine/src/PostProcess.cpp
  2. 2 1
      oxygine/src/TweenOutline.cpp

+ 2 - 2
oxygine/src/PostProcess.cpp

@@ -56,8 +56,8 @@ namespace oxygine
 
 
         file::buffer vs_blit;
         file::buffer vs_blit;
         file::buffer fs_blit;
         file::buffer fs_blit;
-        file::read("pp_blit_vs.glsl", vs_blit);
-        file::read("pp_blit_fs.glsl", fs_blit);
+        zp.read("system/pp_blit_vs.glsl", vs_blit);
+        zp.read("system/pp_blit_fs.glsl", fs_blit);
 
 
         vs_blit.push_back(0);
         vs_blit.push_back(0);
         fs_blit.push_back(0);
         fs_blit.push_back(0);

+ 2 - 1
oxygine/src/TweenOutline.cpp

@@ -95,7 +95,8 @@ namespace oxygine
             pass(rt, rc, rt2, rc);
             pass(rt, rc, rt2, rc);
 
 
 
 
-            int alpha = lerp(255, 0, _progress);
+            int alpha = lerp(0, 255, _progress);
+            //log::messageln("tween alpha %d", alpha);
 
 
             Color c = _color.withAlpha(alpha).premultiplied();
             Color c = _color.withAlpha(alpha).premultiplied();