X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fambientocclusion.cpp;h=444b18b8354cd620fe900ece6ef1c873e6450995;hb=fcaae0500d5c6fa842babe37450c435e4178547a;hp=73736312726ac7013e864ff4e26309ea10082980;hpb=34446c94b58602c0c6e610b889691f0c1645555f;p=libs%2Fgl.git

diff --git a/source/ambientocclusion.cpp b/source/ambientocclusion.cpp
index 73736312..444b18b8 100644
--- a/source/ambientocclusion.cpp
+++ b/source/ambientocclusion.cpp
@@ -1,3 +1,4 @@
+#define _USE_MATH_DEFINES
 #include <cmath>
 #include "ambientocclusion.h"
 #include "blend.h"
@@ -25,9 +26,9 @@ const char occlude_fs[] =
 	"			vec2 offs = transform*vec2(float(i)-1.5, float(j)-1.5);\n"
 	"			float dxy = length(offs)*-sample;\n"
 	"			float dz = depth_ratio.x/(texture2D(depth, texcoord+offs).r-depth_ratio.y)-sample;\n"
-	"			if(abs(dz)<3*dxy)\n"
+	"			if(abs(dz)<3.0*dxy)\n"
 	"				sum += atan(dz/dxy)/1.570796;\n"
-	"			else if(dz<0)\n"
+	"			else if(dz<0.0)\n"
 	"				sum -= 0.8;\n"
 	"		}\n"
 	"	gl_FragColor = vec4(min(1.0-sum*darkness/16.0, 1.0), 0.0, 0.0, 1.0);\n"
@@ -51,7 +52,7 @@ const char combine_fs[] =
 	"			vec2 offs = vec2(float(i)-1.5, float(j)-1.5)/screen_size;\n"
 	"			float dxy = length(offs)*-sample;\n"
 	"			float dz = depth_ratio.x/(texture2D(depth, texcoord+offs).r-depth_ratio.y)-sample;\n"
-	"			if(abs(dz)<3*dxy)\n"
+	"			if(abs(dz)<3.0*dxy)\n"
 	"			{\n"
 	"				sum += texture2D(occlusion, texcoord+offs).r;\n"
 	"				count += 1.0;\n"
@@ -107,12 +108,12 @@ AmbientOcclusion::AmbientOcclusion(unsigned w, unsigned h, float depth_ratio):
 
 	occlude_shdata.uniform("depth", 0);
 	occlude_shdata.uniform("rotate", 1);
-	occlude_shdata.uniform("screen_size", w, h);
+	occlude_shdata.uniform("screen_size", static_cast<float>(w), static_cast<float>(h));
 
 	combine_shdata.uniform("color", 1);
 	combine_shdata.uniform("depth", 0);
 	combine_shdata.uniform("occlusion", 2);
-	combine_shdata.uniform("screen_size", w, h);
+	combine_shdata.uniform("screen_size", static_cast<float>(w), static_cast<float>(h));
 
 	set_depth_ratio(depth_ratio);
 	set_darkness(1.5);