Corrections

Author: oprypin

generate/generate.py

@@ -146,7 +146,7 @@ def subname(name):
         if cls and cls in structs:
             cls = 'CSFML::'+cls
         if cls and cls not in objs[cmodule]:
-            obj(cls, ('struct' if orcls in structs else 'class')+' '+cls)
+            obj(cls, ('struct ' if orcls in structs else 'class ')+cls)
         sub = subname(name)
         suffix = '.value' if name.endswith('Count') else ''
         obj(cls, '{name} = CSFML::{nname}::{sub}{suffix}'.format(**locals()))
@@ -177,7 +177,7 @@ def handle_struct(name, items):
             if '*' in t:
                 continue
             if name and name not in objs[cmodule]:
-                obj(name, 'struct '+name)
+                obj(name, 'struct CSFML::'+name)
 
             obj(name, 'def {}'.format(n))
             if 'Vector2' in t:
@@ -239,7 +239,7 @@ def handle_function(main, params):
         nfname = 'self.'+nfname.split('_', 1)[1]
         cls = ofname.split('_')[0][2:]
     if cls and cls not in objs[cmodule]:
-        obj(cls, ('struct' if cls in structs else 'class')+' '+cls)
+        obj(cls, ('struct CSFML::' if cls in structs else 'class ')+cls)
 
     nfname = rename_identifier(nfname)
     nftype = rename_type(ftype)
@@ -379,6 +379,7 @@ def handle_function(main, params):
     if cut and cls in structs and orparams and not orparams[0][0].startswith('const') and '*' in orparams[0][0]:
         for p in structs[cls]:
             obj(cls, '  self.{0} = cself.{0}'.format(p))
+            obj(cls, '  self')
     obj(cls, 'end', '')
 
 

src/graphics.cr

@@ -23,7 +23,7 @@ require "./graphics_lib"
 module SF
   extend self
 
-  def color(red, green, blue, alpha=255)
+  def color(red: Number, green: Number, blue: Number, alpha=255: Number)
     Color.new(r: red.to_u8, g: green.to_u8, b: blue.to_u8, a: alpha.to_u8)
   end
   struct CSFML::Color
@@ -55,10 +55,10 @@ module SF
     end
   end
 
-  def float_rect(left, top, width, height)
+  def float_rect(left: Number, top: Number, width: Number, height: Number)
     FloatRect.new(left: left.to_f32, top: top.to_f32, width: width.to_f32, height: height.to_f32)
   end
-  def int_rect(left, top, width, height)
+  def int_rect(left: Number, top: Number, width: Number, height: Number)
     IntRect.new(left: left.to_i32, top: top.to_i32, width: width.to_i32, height: height.to_i32)
   end
 
@@ -98,15 +98,15 @@ module SF
       x, y = offset
       translate(x, y)
     end
-    def rotate(angle, center)
+    def rotate(angle: Number, center)
       cx, cy = center
       rotate(angle, cx, cy)
     end
     def scale(factors)
       x, y = factors
       scale(x, y)
     end
-    def scale(factors, center)
+    def scale(factors, center: Number)
       x, y = factors
       cx, cy = center
       scale(x, y, cx, cy)
@@ -194,7 +194,7 @@ module SF
   end
 
   class CircleShape
-    def initialize(radius, point_count=30)
+    def initialize(radius: Number, point_count=30: Int)
       initialize()
       self.radius = radius
       self.point_count = point_count
@@ -217,7 +217,7 @@ module SF
   end
 
   class ConvexShape
-    def initialize(point_count)
+    def initialize(point_count: Int)
       initialize()
       self.point_count = point_count
     end
@@ -261,7 +261,7 @@ module SF
   end
 
   class Text
-    def initialize(string: String, font: Font, character_size=30)
+    def initialize(string: String, font: Font, character_size=30: Int)
       initialize()
       self.string = string
       self.font = font
@@ -396,7 +396,7 @@ module SF
       @transformable = SF::Transformable.new() unless @transformable
       (@transformable || SF::Transformable.new()).position = position
     end
-    def rotation=(angle)
+    def rotation=(angle: Number)
       @transformable = SF::Transformable.new() unless @transformable
       (@transformable || SF::Transformable.new()).rotation = angle
     end
@@ -428,7 +428,7 @@ module SF
       @transformable = SF::Transformable.new() unless @transformable
       (@transformable || SF::Transformable.new()).move(offset)
     end
-    def rotate(angle)
+    def rotate(angle: Number)
       @transformable = SF::Transformable.new() unless @transformable
       (@transformable || SF::Transformable.new()).rotate(angle)
     end

src/graphics_obj.cr

@@ -45,7 +45,7 @@ module SF
   # Utility class for manpulating RGBA colors
   alias Color = CSFML::Color
 
-  struct Color
+  struct CSFML::Color
     # Add two colors
     # 
     # *Arguments*:
@@ -76,7 +76,7 @@ module SF
 
   alias IntRect = CSFML::IntRect
 
-  struct FloatRect
+  struct CSFML::FloatRect
     # Check if a point is inside a rectangle's area
     # 
     # *Arguments*:
@@ -114,7 +114,7 @@ module SF
 
   end
 
-  struct IntRect
+  struct CSFML::IntRect
     def contains(x: Int32, y: Int32)
       cself = self
       CSFML.int_rect_contains(pointerof(cself), x, y) != 0
@@ -5030,7 +5030,7 @@ module SF
   # Encapsulate a 3x3 transform matrix
   alias Transform = CSFML::Transform
 
-  struct Transform
+  struct CSFML::Transform
     # Return the 4x4 matrix of a transform
     # 
     # This function fills an array of 16 floats with the transform
@@ -5113,6 +5113,7 @@ module SF
       cself = self
       CSFML.transform_combine(pointerof(cself), pother)
       self.matrix = cself.matrix
+      self
     end
 
     # Combine a transform with a translation
@@ -5128,6 +5129,7 @@ module SF
       cself = self
       CSFML.transform_translate(pointerof(cself), x, y)
       self.matrix = cself.matrix
+      self
     end
 
     # Combine the current transform with a rotation
@@ -5141,6 +5143,7 @@ module SF
       cself = self
       CSFML.transform_rotate(pointerof(cself), angle)
       self.matrix = cself.matrix
+      self
     end
 
     # Combine the current transform with a rotation
@@ -5163,6 +5166,7 @@ module SF
       cself = self
       CSFML.transform_rotate_with_center(pointerof(cself), angle, center_x, center_y)
       self.matrix = cself.matrix
+      self
     end
 
     # Combine the current transform with a scaling
@@ -5178,6 +5182,7 @@ module SF
       cself = self
       CSFML.transform_scale(pointerof(cself), scale_x, scale_y)
       self.matrix = cself.matrix
+      self
     end
 
     # Combine the current transform with a scaling
@@ -5202,6 +5207,7 @@ module SF
       cself = self
       CSFML.transform_scale_with_center(pointerof(cself), scale_x, scale_y, center_x, center_y)
       self.matrix = cself.matrix
+      self
     end
 
   end
@@ -5229,7 +5235,7 @@ module SF
   # Define the states used for drawing to a RenderTarget
   alias RenderStates = CSFML::RenderStates
 
-  struct RenderStates
+  struct CSFML::RenderStates
     def texture
       SF::Texture.wrap_ptr(@texture)
     end
@@ -5240,7 +5246,7 @@ module SF
 
   alias Vertex = CSFML::Vertex
 
-  struct Vertex
+  struct CSFML::Vertex
     def position
       SF.vector2(@position)
     end

src/system.cr

@@ -56,12 +56,15 @@ module SF
       SF.vector2(x - ox, y - oy)
     end
     def *(other)
-      ox, oy = other
-      SF.vector2(x * ox, y * oy)
+      if other.responds_to? :[]
+        ox, oy = other
+        SF.vector2(x * ox, y * oy)
+      else
+        SF.vector2(x * other, y * other)
+      end
     end
-    def /(other)
-      ox, oy = other
-      SF.vector2(x / ox, y / oy)
+    def /(o)
+      SF.vector2(x / o, y / o)
     end
     def ==(other)
       ox, oy = other

src/system_obj.cr

@@ -7,7 +7,7 @@ module SF
   # Represents a time value
   alias Time = CSFML::Time
 
-  struct Time
+  struct CSFML::Time
     # Return a time value as a number of seconds
     # 
     # *Arguments*:

src/window_obj.cr

@@ -984,7 +984,7 @@ module SF
   # by the display device
   alias VideoMode = CSFML::VideoMode
 
-  struct VideoMode
+  struct CSFML::VideoMode
     # Get the current desktop video mode
     # 
     # *Returns*: Current desktop video mode