Generate sources (8315097)

Author: Robot

README.md

@@ -64,7 +64,7 @@ This section defines two sets of step-by-step instructions to install *CrSFML* b
         - Easier installation.
     - Disadvantages:
         - Tied to a particular version of SFML.
-        - Although sizes of SFML objects seem to always be of equal or smaller sizes than on Linux 64-bit (where the sources are generated), this is not completely guaranteed. So, in case of a mismatch, data may be written outside of the memory region allocated for an object.
+        - Although sizes of SFML objects seem to always be of equal or smaller sizes than on Linux 64-bit with latest GCC (where the sources are generated), this is not completely guaranteed. So, in case of a mismatch, data may be written outside of the memory region allocated for an object.
 
 ### Install SFML
 

examples/diagnostics.cr

@@ -94,13 +94,13 @@ def test_mouse()
     shape.point_count = 3
     shape.fill_color = SF.color(128, 0, 255)
     shape.position = m - {0, 4}
-    shape[0] = SF.vector2(-8, 0)
-    shape[1] = SF.vector2(8, 0)
-    shape[2] = SF.vector2(0, -wheel_delta.y*5)
+    shape[0] = SF.vector2f(-8, 0)
+    shape[1] = SF.vector2f(8, 0)
+    shape[2] = SF.vector2f(0, -wheel_delta.y*5)
     $window.draw shape
-    shape[0] = SF.vector2(0, -8)
-    shape[1] = SF.vector2(0, 8)
-    shape[2] = SF.vector2(-wheel_delta.x*5, 0)
+    shape[0] = SF.vector2f(0, -8)
+    shape[1] = SF.vector2f(0, 8)
+    shape[2] = SF.vector2f(-wheel_delta.x*5, 0)
     $window.draw shape
 
     $window.display()
@@ -149,7 +149,7 @@ def test_controller()
       rescue
         delta = {0, button_pos.size - btn - 1}
       end
-      shape.position = SF.vector2(400, 300) + SF.vector2(delta) * {30, 30}
+      shape.position = SF.vector2(400, 300) + SF.vector2(*delta) * 30
       text.position = shape.position
       shape.fill_color = SF::Joystick.button_pressed?(js, btn) ? SF.color(255, 128, 0) : SF.color(0, 128, 0)
 
@@ -182,7 +182,7 @@ def test_controller()
         any = true
       end
       next unless any
-      shape.position = SF.vector2(400, 300) + SF.vector2(delta) * {30, 30} + {dx*0.3, dy*0.3}
+      shape.position = SF.vector2(400, 300) + SF.vector2(*delta) * 30 + SF.vector2(dx, dy) * 0.3
 
       $window.draw shape
     end
@@ -206,7 +206,7 @@ class Button < SF::RectangleShape
     super(SF.vector2(width, height))
     @text = SF::Text.new(message, $font, (height*0.8).to_i)
     self.fill_color = color
-    @text.position = SF.vector2((width - @text.global_bounds.width) / 2, -height / 20)
+    @text.position = SF.vector2(((width - @text.global_bounds.width) / 2).to_i, -height / 20)
   end
 
   def draw(target, states : SF::RenderStates)
@@ -233,14 +233,18 @@ actions.each_key do |btn|
   y += h + h/2
 end
 
+version_text = SF::Text.new("SFML v#{SF::SFML_VERSION}\nCrSFML v#{SF::VERSION}", $font, 20)
+version_text.origin = {0, version_text.local_bounds.height}
+version_text.position = {5, $window.size.y - 15}
+
 while $window.open?
   while event = $window.poll_event()
     case event
     when SF::Event::Closed
       $window.close()
     when SF::Event::MouseButtonPressed
       actions.each_key do |btn|
-        if btn.global_bounds.contains(event.x.to_f, event.y.to_f)
+        if btn.global_bounds.contains?(event.x.to_f, event.y.to_f)
           actions[btn].call
           break
         end
@@ -252,5 +256,6 @@ while $window.open?
   actions.each_key do |btn|
     $window.draw(btn)
   end
+  $window.draw(version_text)
   $window.display()
 end

examples/echo.cr

@@ -1,48 +1,48 @@
 require "crsfml"
 require "crsfml/audio"
 
-$mutex = SF::Mutex.new()
-
-$samples = Slice(Int16).new(1024*1024, 0i16)
-$count = 0
-
-
 class MySoundRecorder < SF::SoundRecorder
+  def initialize(@samples : Array(Int16), @mutex : SF::Mutex)
+    super()
+  end
   def on_start()
     true
   end
   def on_process_samples(samples)
-    $mutex.lock
-    samples.each do |x|
-      $samples[$count] = x
-      $count += 1
-    end
-    $mutex.unlock
+    @mutex.lock
+    @samples.concat(samples)
+    @mutex.unlock
     true
   end
   def on_stop()
   end
 end
 
 class MySoundStream < SF::SoundStream
+  def initialize(@samples : Array(Int16), @mutex : SF::Mutex, *args)
+    super(*args)
+    @result = [] of Int16
+  end
   def on_get_data()
-    while $count == 0
+    while @samples.empty?
       SF.sleep(SF.seconds(0.05))
     end
-    $mutex.lock
-    result = $samples.to_unsafe.to_slice($count)
-    $count = 0
-    $mutex.unlock
-    result
+    @mutex.lock
+    @result.replace(@samples)
+    @samples.clear
+    @mutex.unlock
+    @result.to_unsafe.to_slice(@result.size)
   end
   def on_seek(position)
   end
 end
 
+samples = Array(Int16).new
+mutex = SF::Mutex.new()
 
-sr = MySoundRecorder.new()
+sr = MySoundRecorder.new(samples, mutex)
 sr.start(44100)
-ss = MySoundStream.new(1, 44100)
+ss = MySoundStream.new(samples, mutex, 1, 44100)
 ss.play()
 
 puts "Recording... Press Enter to stop"

examples/shader.cr

@@ -24,7 +24,7 @@ text.position = {30, 20}
 text.color = SF::Color::Black
 wb_shader = SF::Shader.from_file("resources/shaders/wave.vert", "resources/shaders/blur.frag")
 
-window = SF::RenderWindow.new(SF::VideoMode.new(800, 600), "SFML Shader", SF::Titlebar|SF::Close)
+window = SF::RenderWindow.new(SF::VideoMode.new(800, 600), "SFML Shader", SF::Style::Titlebar|SF::Style::Close)
 window.vertical_sync_enabled = true
 
 scene = rand(2)

src/audio/lib.cr

@@ -27,7 +27,7 @@ lib VoidCSFML
   fun soundsource_isrelativetolistener(self : Void*, result : Bool*)
   fun soundsource_getmindistance(self : Void*, result : LibC::Float*)
   fun soundsource_getattenuation(self : Void*, result : LibC::Float*)
-  $soundstream_ongetdata_callback : Void*, Int16*, LibC::SizeT, Bool* ->
+  $soundstream_ongetdata_callback : Void*, Int16**, LibC::SizeT*, Bool* ->
   $soundstream_onseek_callback : Void*, Void* ->
   fun soundstream_finalize(self : Void*)
   fun soundstream_play(self : Void*)