浏览代码

Merge pull request #1536 from Azaezel/flagFix

opengl crashfix pow(x,y) needed to be passed matching vartypes.
Anis 9 年之前
父节点
当前提交
c90dcdf54b
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      Templates/Full/game/shaders/common/gl/torque.glsl

+ 3 - 3
Templates/Full/game/shaders/common/gl/torque.glsl

@@ -285,11 +285,11 @@ void fizzle(vec2 vpos, float visibility)
 #define assert(condition, color) { if(!any(condition)) { OUT_col = color; return; } }
 
 // Deferred Shading: Material Info Flag Check
-bool getFlag(float flags, int num)
+bool getFlag(float flags, float num)
 {
    float process = round(flags * 255);
-   float squareNum = pow(2, num);
-   return (mod(process, pow(2, squareNum)) >= squareNum); 
+   float squareNum = pow(2.0, num);
+   return (mod(process, pow(2.0, squareNum)) >= squareNum); 
 }
 
 // #define TORQUE_STOCK_GAMMA