Imported Upstream version 1.3

28 files changed, 5 insertions, 5 deletions

diff --git a/samples/bin/X11 b/samples/bin/X11
index e30f6b1..592d6e4 100755
--- a/samples/bin/X11
+++ b/samples/bin/X11
diff --git a/samples/bin/datas/opengl/background.jpg b/samples/bin/datas/opengl/background.jpg
index 5b2247d..5b2247d 100644..100755
--- a/samples/bin/datas/opengl/background.jpg
+++ b/samples/bin/datas/opengl/background.jpg
diff --git a/samples/bin/datas/opengl/texture.jpg b/samples/bin/datas/opengl/texture.jpg
index 455a99f..455a99f 100644..100755
--- a/samples/bin/datas/opengl/texture.jpg
+++ b/samples/bin/datas/opengl/texture.jpg
diff --git a/samples/bin/datas/pong/background.jpg b/samples/bin/datas/pong/background.jpg
index 06dfdb8..06dfdb8 100644..100755
--- a/samples/bin/datas/pong/background.jpg
+++ b/samples/bin/datas/pong/background.jpg
diff --git a/samples/bin/datas/pong/ball.png b/samples/bin/datas/pong/ball.png
index c296859..c296859 100644..100755
--- a/samples/bin/datas/pong/ball.png
+++ b/samples/bin/datas/pong/ball.png
diff --git a/samples/bin/datas/pong/paddle_left.png b/samples/bin/datas/pong/paddle_left.png
index 63592c9..63592c9 100644..100755
--- a/samples/bin/datas/pong/paddle_left.png
+++ b/samples/bin/datas/pong/paddle_left.png
diff --git a/samples/bin/datas/pong/paddle_right.png b/samples/bin/datas/pong/paddle_right.png
index d408c5f..d408c5f 100644..100755
--- a/samples/bin/datas/pong/paddle_right.png
+++ b/samples/bin/datas/pong/paddle_right.png
diff --git a/samples/bin/datas/post-fx/background.jpg b/samples/bin/datas/post-fx/background.jpg
index c778e86..c778e86 100644..100755
--- a/samples/bin/datas/post-fx/background.jpg
+++ b/samples/bin/datas/post-fx/background.jpg
diff --git a/samples/bin/datas/post-fx/blur.sfx b/samples/bin/datas/post-fx/blur.sfx
index 2b67139..04bfec5 100644..100755
--- a/samples/bin/datas/post-fx/blur.sfx
+++ b/samples/bin/datas/post-fx/blur.sfx
@@ -3,8 +3,8 @@ float offset
 

 effect

 {

-	vec2 offx = vec2(offset, 0);

-	vec2 offy = vec2(0, offset);

+	vec2 offx = vec2(offset, 0.0);

+	vec2 offy = vec2(0.0, offset);

 

 	vec4 c0 = framebuffer(_in);

 	vec4 c1 = framebuffer(_in - offy);

diff --git a/samples/bin/datas/post-fx/colorize.sfx b/samples/bin/datas/post-fx/colorize.sfx
index bcb48eb..bcb48eb 100644..100755
--- a/samples/bin/datas/post-fx/colorize.sfx
+++ b/samples/bin/datas/post-fx/colorize.sfx
diff --git a/samples/bin/datas/post-fx/fisheye.sfx b/samples/bin/datas/post-fx/fisheye.sfx
index 0b49e36..cbc31ee 100644..100755
--- a/samples/bin/datas/post-fx/fisheye.sfx
+++ b/samples/bin/datas/post-fx/fisheye.sfx
@@ -3,9 +3,9 @@ vec2 mouse
 

 effect

 {

-	float len = distance(_in, mouse) * 7;

+	float len = distance(_in, mouse) * 7.0;

 

-	if (len < 1)

+	if (len < 1.0)

 		_out = framebuffer(_in + (_in - mouse) * len);

 	else

 		_out = framebuffer(_in);	

diff --git a/samples/bin/datas/post-fx/nothing.sfx b/samples/bin/datas/post-fx/nothing.sfx
index 133b4e3..133b4e3 100644..100755
--- a/samples/bin/datas/post-fx/nothing.sfx
+++ b/samples/bin/datas/post-fx/nothing.sfx
diff --git a/samples/bin/datas/post-fx/wave.jpg b/samples/bin/datas/post-fx/wave.jpg
index cd125b8..cd125b8 100644..100755
--- a/samples/bin/datas/post-fx/wave.jpg
+++ b/samples/bin/datas/post-fx/wave.jpg
diff --git a/samples/bin/datas/post-fx/wave.sfx b/samples/bin/datas/post-fx/wave.sfx
index cc980b0..49b4607 100644..100755
--- a/samples/bin/datas/post-fx/wave.sfx
+++ b/samples/bin/datas/post-fx/wave.sfx
@@ -4,7 +4,7 @@ vec2 offset
 

 effect

 {

-	vec2 texoffset = wave(_in + offset).xy;

+	vec2 texoffset = wave(_in * offset).xy;

 	texoffset -= vec2(0.5, 0.5);

 	texoffset *= 0.05;

 

diff --git a/samples/bin/datas/qt/sfml.png b/samples/bin/datas/qt/sfml.png
index 77ca41e..77ca41e 100644..100755
--- a/samples/bin/datas/qt/sfml.png
+++ b/samples/bin/datas/qt/sfml.png
diff --git a/samples/bin/datas/win32/image1.jpg b/samples/bin/datas/win32/image1.jpg
new file mode 100755
index 0000000..50ecf04
--- /dev/null
+++ b/samples/bin/datas/win32/image1.jpg
diff --git a/samples/bin/datas/win32/image2.jpg b/samples/bin/datas/win32/image2.jpg
new file mode 100755
index 0000000..7337028
--- /dev/null
+++ b/samples/bin/datas/win32/image2.jpg
diff --git a/samples/bin/datas/wxwidgets/sfml.png b/samples/bin/datas/wxwidgets/sfml.png
index 77ca41e..77ca41e 100644..100755
--- a/samples/bin/datas/wxwidgets/sfml.png
+++ b/samples/bin/datas/wxwidgets/sfml.png
diff --git a/samples/bin/opengl b/samples/bin/opengl
index e230341..b504bd3 100755
--- a/samples/bin/opengl
+++ b/samples/bin/opengl
diff --git a/samples/bin/pong b/samples/bin/pong
index d83d57d..d9bca0d 100755
--- a/samples/bin/pong
+++ b/samples/bin/pong
diff --git a/samples/bin/post-fx b/samples/bin/post-fx
index bc4c4ca..c441af9 100755
--- a/samples/bin/post-fx
+++ b/samples/bin/post-fx
diff --git a/samples/bin/qt b/samples/bin/qt
index b9f298a..1cad879 100755
--- a/samples/bin/qt
+++ b/samples/bin/qt
diff --git a/samples/bin/sockets b/samples/bin/sockets
index ebcb69e..d968d65 100755
--- a/samples/bin/sockets
+++ b/samples/bin/sockets
diff --git a/samples/bin/sound b/samples/bin/sound
index 9bf2aae..a680e58 100755
--- a/samples/bin/sound
+++ b/samples/bin/sound
diff --git a/samples/bin/sound_capture b/samples/bin/sound_capture
index 59ea9b4..be5e6c6 100755
--- a/samples/bin/sound_capture
+++ b/samples/bin/sound_capture
diff --git a/samples/bin/voip b/samples/bin/voip
index c75e65e..44e3264 100755
--- a/samples/bin/voip
+++ b/samples/bin/voip
diff --git a/samples/bin/window b/samples/bin/window
index 2a35a62..2d21571 100755
--- a/samples/bin/window
+++ b/samples/bin/window
diff --git a/samples/bin/wxwidgets b/samples/bin/wxwidgets
index 9557467..07487a5 100755
--- a/samples/bin/wxwidgets
+++ b/samples/bin/wxwidgets