Skip to content

Commit 92ee08d

Browse files
MaximDudeMaximDude
committed
Cleanup and misc changes
1 parent 27833fb commit 92ee08d

10 files changed

+254
-244
lines changed

‎Bender.bmx

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Import "Types/UserInterface.bmx"
1313
Import "Types/FileIO.bmx"
1414
Import "Types/GraphicsOutput.bmx"
1515

16-
'//// MAIN LOOP AND EVENT HANDLING //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
16+
'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
1717

1818
AppTitle = "CCCP Bender 1.3.0"
1919

@@ -22,7 +22,7 @@ Global g_UserInterface:UserInterface = Null
2222
Global g_FileIO:FileIO = Null
2323
Global g_GraphicsOutput:GraphicsOutput = Null
2424

25-
'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
25+
'//// MAIN LOOP AND EVENT HANDLING //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
2626

2727
Repeat
2828
g_SettingsManager = New SettingsManager()
@@ -31,7 +31,7 @@ Repeat
3131
g_GraphicsOutput = New GraphicsOutput(g_UserInterface.GetMaxWorkspaceWidth())
3232
EnablePolledInput()
3333

34-
'Apply user settings/defaults
34+
'Apply user settings/defaults.
3535
g_UserInterface.SetColorTextboxValues(g_GraphicsOutput.SetBackgroundColor(Int[][g_DefaultBackgroundRed, g_DefaultBackgroundGreen, g_DefaultBackgroundBlue]))
3636
g_UserInterface.SetInputZoomTextboxValue(g_GraphicsOutput.SetInputZoom(g_DefaultInputZoom))
3737
g_UserInterface.SetOutputZoomTextboxValue(g_GraphicsOutput.SetOutputZoom(g_DefaultOutputZoom))
@@ -44,10 +44,6 @@ Repeat
4444
PollEvent()
4545

4646
Select EventID()
47-
'Case EVENT_WINDOWACTIVATE
48-
'Case EVENT_GADGETSELECT
49-
'Case EVENT_GADGETLOSTFOCUS
50-
5147
Case EVENT_APPRESUME
5248
ActivateWindow(g_UserInterface.m_MainWindow)
5349
Case EVENT_WINDOWSIZE
@@ -65,44 +61,44 @@ Repeat
6561
EndSelect
6662
Case EVENT_GADGETACTION
6763
Select EventSource()
68-
'Loading
64+
'Loading.
6965
Case g_UserInterface.m_LoadButton
7066
g_UserInterface.SetSaveButtonEnabled(g_GraphicsOutput.LoadFile(g_FileIO.SetFileToLoad()))
71-
'Saving
67+
'Saving.
7268
Case g_UserInterface.m_SaveButton
7369
If g_FileIO.GetSaveAsFrames() Then
7470
g_GraphicsOutput.RevertBackgroundColorAfterSave(g_FileIO.SaveFileAsFrames(g_GraphicsOutput.GrabOutputFramesForSaving(), g_GraphicsOutput.GetFrameCount()))
7571
Else
7672
g_GraphicsOutput.RevertBackgroundColorAfterSave(g_FileIO.SaveFile(g_GraphicsOutput.GrabOutputForSaving()))
7773
EndIf
7874
Continue
79-
'Input Scale
75+
'Input Scale.
8076
Case g_UserInterface.m_SettingsInputZoomTextbox
8177
g_UserInterface.SetInputZoomTextboxValue(g_GraphicsOutput.SetInputZoom(g_UserInterface.GetInputZoomTextboxValue()))
82-
'Output Scale
78+
'Output Scale.
8379
Case g_UserInterface.m_SettingsOutputZoomTextbox
8480
g_UserInterface.SetOutputZoomTextboxValue(g_GraphicsOutput.SetOutputZoom(g_UserInterface.GetOutputZoomTextboxValue()))
85-
'Frames
81+
'Frames.
8682
Case g_UserInterface.m_SettingsFramesTextbox
8783
g_UserInterface.SetFramesTextboxValue(g_GraphicsOutput.SetFrameCount(g_UserInterface.GetFramesTextboxValue()))
88-
'BG Color
84+
'BG Color.
8985
Case g_UserInterface.m_SettingsColorRTextbox, g_UserInterface.m_SettingsColorGTextbox, g_UserInterface.m_SettingsColorBTextbox
9086
g_UserInterface.SetColorTextboxValues(g_GraphicsOutput.SetBackgroundColor(g_UserInterface.GetColorTextboxValues()))
91-
'Save as Frames
87+
'Save as Frames.
9288
Case g_UserInterface.m_SettingsSaveAsFramesCheckbox
9389
g_GraphicsOutput.SetDrawOutputFrameBounds(g_FileIO.SetSaveAsFrames(g_UserInterface.GetSaveAsFramesCheckboxValue()))
94-
'Save as Indexed
90+
'Save as Indexed.
9591
Case g_UserInterface.m_SettingsIndexedCheckbox
9692
g_UserInterface.SetFileTypeComboBoxVisible(g_FileIO.SetSaveAsIndexed(g_UserInterface.GetSaveAsIndexedCheckboxValue()))
97-
'Indexed Filetype
93+
'Indexed Filetype.
9894
Case g_UserInterface.m_SettingsIndexedFileTypeComboBox
9995
g_FileIO.SetIndexedFileType(GadgetText(g_UserInterface.m_SettingsIndexedFileTypeComboBox))
100-
'Layering Controls
96+
'Layering Controls.
10197
Case g_UserInterface.m_LayeringArmFGCheckbox, g_UserInterface.m_LayeringArmBGCheckbox, g_UserInterface.m_LayeringLegFGCheckbox, g_UserInterface.m_LayeringLegBGCheckbox
10298
g_GraphicsOutput.SetBentLimbPartDrawOrder(g_UserInterface.SetLayerCheckboxLabels(g_UserInterface.GetLayerCheckboxValues()))
10399
EndSelect
104100
Case EVENT_KEYDOWN
105-
If Not GadgetDisabled(g_UserInterface.m_SaveButton) And (KeyDown(KEY_LCONTROL) Or KeyDown(KEY_RCONTROL)) And KeyDown(KEY_S) Then
101+
If g_UserInterface.GetSaveButtonEnabled() And (KeyDown(KEY_LCONTROL) Or KeyDown(KEY_RCONTROL)) And KeyDown(KEY_S) Then
106102
If g_FileIO.GetSaveAsFrames() Then
107103
g_GraphicsOutput.RevertBackgroundColorAfterSave(g_FileIO.SaveFileAsFrames(g_GraphicsOutput.GrabOutputFramesForSaving(), g_GraphicsOutput.GetFrameCount()))
108104
Else

‎Types/FileIO.bmx

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,19 @@ Type FileIO
6767
Return m_IndexedFileType
6868
EndMethod
6969

70+
'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
71+
72+
Method CheckValidExportFileName:Int(filenameToCheck:String)
73+
If filenameToCheck = m_ImportedFile Then
74+
Notify("Cannot overwrite source image!", True)
75+
Return False
76+
ElseIf filenameToCheck <> m_ImportedFile And filenameToCheck <> Null Then
77+
Return True
78+
Else
79+
Return False 'On RequestFile cancel.
80+
EndIf
81+
EndMethod
82+
7083
'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
7184

7285
Method SaveFile:Int(pixmapToSave:TPixmap)
@@ -91,46 +104,46 @@ Type FileIO
91104
Notify("File saved successfully!")
92105
EndIf
93106
EndIf
94-
Return True 'Return something to indicate function finished so workspace can be reverted
107+
Return True 'Return something to indicate function finished so workspace can be reverted.
95108
EndMethod
96109

97110
'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
98111

99112
Method SaveFileAsFrames:Int(pixmapToSave:TPixmap[,], frameCount:Int)
100-
Local filename:String = RequestFile("Save graphic output", Null, True) 'No file extensions here, we add them later manually otherwise exported file name is messed up
113+
Local filename:String = RequestFile("Save graphic output", Null, True) 'No file extensions from filters here, we add them later manually otherwise exported file name is messed up.
101114
If pixmapToSave <> Null And CheckValidExportFileName(filename) Then
102115
Local saveSuccess:Int = True
103-
For Local row:Int = 0 To 3
104-
Local rowName:String 'Name the rows - by default: ArmFG, ArmBG, LegFG, LegBG in this order
105-
Select row
116+
For Local limb:Int = 0 To 3
117+
Local limbName:String 'Name the limbs - by default: ArmFG, ArmBG, LegFG, LegBG in this order.
118+
Select limb
106119
Case 0
107-
rowName = "ArmFG"
120+
limbName = "ArmFG"
108121
Case 1
109-
rowName = "ArmBG"
122+
limbName = "ArmBG"
110123
Case 2
111-
rowName = "LegFG"
124+
limbName = "LegFG"
112125
Case 3
113-
rowName = "LegBG"
126+
limbName = "LegBG"
114127
EndSelect
115128

116129
For Local frame:Int = 0 To frameCount - 1
117130
Local leadingZeros:String = "00"
118-
Local fullFilename:String = filename + rowName + leadingZeros + frame
131+
Local fullFilename:String = filename + limbName + leadingZeros + frame
119132
If frame < 10 Then
120133
leadingZeros = "0"
121134
EndIf
122135

123136
If m_SaveAsIndexed Then
124137
Select m_IndexedFileType
125138
Case "png"
126-
saveSuccess = m_IndexedImageWriter.WriteIndexedPNGFromPixmap(pixmapToSave[row, frame], fullFilename + ".png")
139+
saveSuccess = m_IndexedImageWriter.WriteIndexedPNGFromPixmap(pixmapToSave[limb, frame], fullFilename + ".png")
127140
Case "bmp"
128-
saveSuccess = m_IndexedImageWriter.WriteIndexedBMPFromPixmap(pixmapToSave[row, frame], fullFilename + ".bmp")
141+
saveSuccess = m_IndexedImageWriter.WriteIndexedBMPFromPixmap(pixmapToSave[limb, frame], fullFilename + ".bmp")
129142
Default
130143
saveSuccess = False
131144
EndSelect
132145
Else
133-
saveSuccess = SavePixmapPNG(pixmapToSave[row, frame], fullFilename + ".png")
146+
saveSuccess = SavePixmapPNG(pixmapToSave[limb, frame], fullFilename + ".png")
134147
EndIf
135148

136149
If Not saveSuccess Then
@@ -143,19 +156,6 @@ Type FileIO
143156
Notify("Files saved successfully!")
144157
EndIf
145158
EndIf
146-
Return True 'Return something to indicate function finished so workspace can be reverted
147-
EndMethod
148-
149-
'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
150-
151-
Method CheckValidExportFileName:Int(filenameToCheck:String)
152-
If filenameToCheck = m_ImportedFile Then
153-
Notify("Cannot overwrite source image!", True)
154-
Return False
155-
ElseIf filenameToCheck <> m_ImportedFile And filenameToCheck <> Null Then
156-
Return True
157-
Else
158-
Return False 'On RequestFile cancel
159-
EndIf
159+
Return True 'Return something to indicate function finished so workspace can be reverted.
160160
EndMethod
161161
EndType

0 commit comments

Comments
 (0)