Skip to content

Commit c439bb1

Browse files
MaximDudeMaximDude
committed
Get image/pixmap dimensions from member instead of function
1 parent 035d98f commit c439bb1

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

‎types/GraphicsOutput.bmx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Type GraphicsOutput
3636
m_SourceImage = LoadImage(fileToLoad, 0)
3737

3838
If m_SourceImage <> Null Then
39-
m_SourceImageSize = New SVec2I(ImageWidth(m_SourceImage), ImageHeight(m_SourceImage))
39+
m_SourceImageSize = New SVec2I(m_SourceImage.Width, m_SourceImage.Height)
4040
DrawImageRect(m_SourceImage, 0, 0, m_SourceImageSize[0] * m_InputZoom, m_SourceImageSize[1] * m_InputZoom) 'Draw the source image to the backbuffer so limb tiles can be created
4141
m_LimbManager.CreateLimbParts(m_InputZoom, m_TileSize)
4242
EndIf

‎types/IndexedImageWriter.bmx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ Type IndexedImageWriter
6262
If filename = Null Then
6363
Return False
6464
Else
65-
Local bmpWidth:Int = PixmapWidth(sourcePixmap)
65+
Local bmpWidth:Int = sourcePixmap.Width
6666
Local bmpWidthM4:Int = ((bmpWidth + 3) / 4) * 4 'bmpWidth adjusted to be divisible by 4. Written file is spaghetti if not adjusted!
67-
Local bmpHeight:Int = PixmapHeight(sourcePixmap)
67+
Local bmpHeight:Int = sourcePixmap.Height
6868
Local bmpSizeTotal:Int = (14 + 40) + (256 * 4) + (bmpWidthM4 * bmpHeight) 'File header size + DIB header size + color table size + dimensions (with adjusted width)
6969
Local bmpSizeTotalM4:Int = ((bmpSizeTotal + 3) / 4) * 4 'bmpSizeTotal adjusted to be divisible by 4. Written file is spaghetti if not adjusted!
7070

@@ -125,8 +125,8 @@ Type IndexedImageWriter
125125
If filename = Null Then
126126
Return False
127127
Else
128-
Local pngWidth:Int = PixmapWidth(sourcePixmap)
129-
Local pngHeight:Int = PixmapHeight(sourcePixmap)
128+
Local pngWidth:Int = sourcePixmap.Width
129+
Local pngHeight:Int = sourcePixmap.Height
130130

131131
'Begin writing PNG file manually
132132
Local outputStream:TStream = BigEndianStream(WriteFile(filename)) 'PNG file data is stored in network byte order (big-endian, most-significant byte first)

‎types/LimbManager.bmx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -169,31 +169,31 @@ Type LimbManager
169169
'Arm FG
170170
Local limbPart:Int = 0
171171
SetRotation(m_LimbPartAngle[limbPart, frame])
172-
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], ImageWidth(m_LimbPartImage[limbPart]) / m_InputZoom, ImageHeight(m_LimbPartImage[limbPart]) / m_InputZoom)
172+
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], m_LimbPartImage[limbPart].Width / m_InputZoom, m_LimbPartImage[limbPart].Height / m_InputZoom)
173173
limbPart = 1
174174
SetRotation(m_LimbPartAngle[limbPart, frame])
175-
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], ImageWidth(m_LimbPartImage[limbPart]) / m_InputZoom, ImageHeight(m_LimbPartImage[limbPart]) / m_InputZoom)
175+
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], m_LimbPartImage[limbPart].Width / m_InputZoom, m_LimbPartImage[limbPart].Height / m_InputZoom)
176176
'Arm BG
177177
limbPart = 2
178178
SetRotation(m_LimbPartAngle[limbPart, frame])
179-
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], ImageWidth(m_LimbPartImage[limbPart]) / m_InputZoom, ImageHeight(m_LimbPartImage[limbPart]) / m_InputZoom)
179+
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], m_LimbPartImage[limbPart].Width / m_InputZoom, m_LimbPartImage[limbPart].Height / m_InputZoom)
180180
limbPart = 3
181181
SetRotation(m_LimbPartAngle[limbPart, frame])
182-
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], ImageWidth(m_LimbPartImage[limbPart]) / m_InputZoom, ImageHeight(m_LimbPartImage[limbPart]) / m_InputZoom)
182+
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], m_LimbPartImage[limbPart].Width / m_InputZoom, m_LimbPartImage[limbPart].Height / m_InputZoom)
183183
'Leg FG
184184
limbPart = 4
185185
SetRotation(m_LimbPartAngle[limbPart, frame])
186-
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], ImageWidth(m_LimbPartImage[limbPart]) / m_InputZoom, ImageHeight(m_LimbPartImage[limbPart]) / m_InputZoom)
186+
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], m_LimbPartImage[limbPart].Width / m_InputZoom, m_LimbPartImage[limbPart].Height / m_InputZoom)
187187
limbPart = 5
188188
SetRotation(m_LimbPartAngle[limbPart, frame])
189-
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], ImageWidth(m_LimbPartImage[limbPart]) / m_InputZoom, ImageHeight(m_LimbPartImage[limbPart]) / m_InputZoom)
189+
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], m_LimbPartImage[limbPart].Width / m_InputZoom, m_LimbPartImage[limbPart].Height / m_InputZoom)
190190
'Leg BG
191191
limbPart = 6
192192
SetRotation(m_LimbPartAngle[limbPart, frame])
193-
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], ImageWidth(m_LimbPartImage[limbPart]) / m_InputZoom, ImageHeight(m_LimbPartImage[limbPart]) / m_InputZoom)
193+
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], m_LimbPartImage[limbPart].Width / m_InputZoom, m_LimbPartImage[limbPart].Height / m_InputZoom)
194194
limbPart = 7
195195
SetRotation(m_LimbPartAngle[limbPart, frame])
196-
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], ImageWidth(m_LimbPartImage[limbPart]) / m_InputZoom, ImageHeight(m_LimbPartImage[limbPart]) / m_InputZoom)
196+
DrawImageRect(m_LimbPartImage[limbPart], m_LimbPartPosX[limbPart, frame] + drawPos[0], m_LimbPartPosY[limbPart, frame] + drawPos[1], m_LimbPartImage[limbPart].Width / m_InputZoom, m_LimbPartImage[limbPart].Height / m_InputZoom)
197197
Next
198198
SetRotation(0)
199199
EndMethod

‎types/UserInterface.bmx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Type UserInterface
5858

5959
Field m_LogoImage:TPixmap = LoadPixmap("Incbin::Assets/Logo")
6060
Field m_LogoImagePanel:TGadget
61-
Field m_LogoImagePanelAnchor:SVec2I = New SVec2I(0, m_LeftColumnSize[1] - PixmapHeight(m_LogoImage))
62-
Field m_LogoImagePanelSize:SVec2I = New SVec2I(PixmapWidth(m_LogoImage), PixmapHeight(m_LogoImage))
61+
Field m_LogoImagePanelAnchor:SVec2I = New SVec2I(0, m_LeftColumnSize[1] - m_LogoImage.Height)
62+
Field m_LogoImagePanelSize:SVec2I = New SVec2I(m_LogoImage.Width, m_LogoImage.Height)
6363

6464
'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
6565

0 commit comments

Comments
 (0)