Browse Source

Fix: [Max2d.mod] Only require graphics instance if needed

Ronny Otto 1 year ago
parent
commit
07a91403fe
1 changed files with 27 additions and 27 deletions
  1. 27 27
      max2d.mod/max2d.bmx

+ 27 - 27
max2d.mod/max2d.bmx

@@ -521,18 +521,18 @@ Type TMax2DGraphics Extends TGraphics
 	End Method
 
 
-	Method SetMaskColor( red:Int, green:Int, blue:Int )
+	Function SetMaskColor( red:Int, green:Int, blue:Int )
 		mask_red = red
 		mask_green = green
 		mask_blue = blue
-	End Method
+	End Function
 
 
-	Method GetMaskColor( red:Int Var, green:Int Var, blue:Int Var )
+	Function GetMaskColor( red:Int Var, green:Int Var, blue:Int Var )
 		red = mask_red
 		green = mask_green
 		blue = mask_blue
-	End Method
+	End Function
 
 
 	Method SetVirtualResolution( width:Float, height:Float )
@@ -700,48 +700,48 @@ Type TMax2DGraphics Extends TGraphics
 	End Method
 
 
-	Method AutoMidHandle( enable:Int )
+	Function AutoMidHandle( enable:Int )
 		auto_midhandle = enable
-	End Method
+	End Function
 
 
-	Method AutoImageFlags( flags:Int )
+	Function AutoImageFlags( flags:Int )
 		auto_imageflags = flags
-	End Method
+	End Function
 
 
-	Method GetAutoImageFlags:Int()
+	Function GetAutoImageFlags:Int()
 		Return auto_imageflags
-	End Method
+	End Function
 
 
-	Method LoadImage:TImage( url:Object, flags:Int = -1 )
+	Function LoadImage:TImage( url:Object, flags:Int = -1 )
 		If flags = -1 Then flags = auto_imageflags
 		Local image:TImage = TImage.Load(url, flags, mask_red, mask_green, mask_blue)
 		If Not image Then Return Null
 		
 		If auto_midhandle Then MidHandleImage(image)
 		Return image
-	End Method
+	End Function
 
 
-	Method LoadAnimImage:TImage( url:Object, cell_width:Int, cell_height:Int, first_cell:Int, cell_count:Int, flags:Int = -1 )
+	Function LoadAnimImage:TImage( url:Object, cell_width:Int, cell_height:Int, first_cell:Int, cell_count:Int, flags:Int = -1 )
 		If flags = -1 Then flags = auto_imageflags
 		Local image:TImage = TImage.LoadAnim(url, cell_width, cell_height, first_cell, cell_count, flags, mask_red, mask_green, mask_blue)
 		If Not image Then Return Null
 
 		If auto_midhandle Then MidHandleImage(image)
 		Return image
-	End Method 
+	End Function
 
 
-	Method CreateImage:TImage( width:Int, height:Int, frames:Int = 1, flags:Int = -1 )
+	Function CreateImage:TImage( width:Int, height:Int, frames:Int = 1, flags:Int = -1 )
 		If flags = -1 Then flags = auto_imageflags
 		Local image:TImage = TImage.Create(width, height, frames, flags | DYNAMICIMAGE, mask_red, mask_green, mask_blue)
 	
 		If auto_midhandle Then MidHandleImage(image)
 		Return image
-	End Method
+	End Function
 
 
 	Method GrabImage( image:TImage, x:Int, y:Int, frame:Int = 0 )
@@ -757,13 +757,13 @@ Type TMax2DGraphics Extends TGraphics
 		_max2ddriver.SetBackBuffer()
 	EndMethod
 	
-	Method CreateRenderImage:TRenderImage(width:UInt, height:UInt, flags:Int=-1)
+	Function CreateRenderImage:TRenderImage(width:UInt, height:UInt, flags:Int=-1)
 		If flags = -1 Then flags = auto_imageflags
 		Local image:TRenderImage = TRenderImage.Create(width, height, flags, mask_red, mask_green, mask_blue)
 		
 		If auto_midhandle Then MidHandleImage(image)
 		Return image
-	End Method
+	End Function
 
 	Method SetRenderImageFrame(RenderImageFrame:TImageFrame)
 		If Not RenderImageFrame
@@ -1294,7 +1294,7 @@ The current mask color is used to build an alpha mask when images are loaded or
 The @red, @green and @blue parameters should be in the range of 0 to 255.
 End Rem
 Function SetMaskColor( red:Int, green:Int, blue:Int )
-	TMax2DGraphics.Current().SetMaskColor(red, green, blue)
+	TMax2DGraphics.SetMaskColor(red, green, blue)
 End Function
 
 Rem
@@ -1302,7 +1302,7 @@ bbdoc: Get red, green and blue component of current mask color
 returns: Red, green and blue values in the range 0..255 
 End Rem
 Function GetMaskColor( red:Int Var, green:Int Var, blue:Int Var )
-	TMax2DGraphics.Current().GetMaskColor(red, green, blue)
+	TMax2DGraphics.GetMaskColor(red, green, blue)
 End Function
 
 Rem
@@ -1640,7 +1640,7 @@ If flags is -1, the auto image flags are used: See #AutoImageFlags.
 To combine flags, use the | (boolean OR) operator.
 End Rem
 Function LoadImage:TImage( url:Object, flags:Int = -1 )
-	Return TMax2DGraphics.Current().LoadImage(url, flags)
+	Return TMax2DGraphics.LoadImage(url, flags)
 End Function
 
 Rem
@@ -1653,7 +1653,7 @@ existing pixmap.
 See #LoadImage for valid @flags values.
 End Rem
 Function LoadAnimImage:TImage( url:Object, cell_width:Int, cell_height:Int, first_cell:Int, cell_count:Int, flags:Int = -1 )
-	Return TMax2DGraphics.Current().LoadAnimImage(url, cell_width, cell_height, first_cell, cell_count, flags)
+	Return TMax2DGraphics.LoadAnimImage(url, cell_width, cell_height, first_cell, cell_count, flags)
 End Function
 
 Rem
@@ -1714,7 +1714,7 @@ when they are created. If auto midhandle mode is disabled, images are handled by
 AutoMidHandle defaults to False after calling #Graphics.
 End Rem
 Function AutoMidHandle( enable:Int )
-	TMax2DGraphics.Current().AutoMidHandle(enable)
+	TMax2DGraphics.AutoMidHandle(enable)
 End Function
 
 Rem
@@ -1725,11 +1725,11 @@ flags are specified. See #LoadImage for a full list of valid image flags.
 AutoImageFlags defaults to MASKEDIMAGE | FILTEREDIMAGE.
 End Rem
 Function AutoImageFlags( flags:Int )
-	TMax2DGraphics.Current().AutoImageFlags(flags)
+	TMax2DGraphics.AutoImageFlags(flags)
 End Function
 
 Function GetAutoImageFlags:Int()
-	Return TMax2DGraphics.Current().GetAutoImageFlags()
+	Return TMax2DGraphics.GetAutoImageFlags()
 End Function
 
 Rem
@@ -1766,7 +1766,7 @@ before being drawn.
 Please refer to #LoadImage for valid @flags values. The @flags value is always combined with DYNAMICIMAGE.
 End Rem
 Function CreateImage:TImage( width:Int, height:Int, frames:Int = 1, flags:Int = -1 )
-	Return TMax2DGraphics.Current().CreateImage(width, height, frames, flags)
+	Return TMax2DGraphics.CreateImage(width, height, frames, flags)
 End Function
 
 Rem
@@ -1829,7 +1829,7 @@ about:
 returns: #TRenderImage with the given dimension
 End Rem
 Function CreateRenderImage:TRenderImage(width:UInt, height:UInt, flags:Int=-1)
-	Return TMax2DGraphics.Current().CreateRenderImage(width, height, flags)
+	Return TMax2DGraphics.CreateRenderImage(width, height, flags)
 End Function