Get saving working again

Author: MaximDude

Bender.bmx

@@ -55,7 +55,12 @@ Repeat
 						g_GraphicsOutput.LoadFile(g_FileIO.SetFileToLoad())
 					'Saving
 					Case g_UserInterface.m_SaveButton
-						g_GraphicsOutput.GrabOutputForSaving()
+						If g_FileIO.GetSaveAsFrames() Then
+							g_GraphicsOutput.RevertBackgroundColorAfterSave(g_FileIO.SaveFileAsFrames(g_GraphicsOutput.GrabOutputFramesForSaving(), g_GraphicsOutput.GetFrameCount()))
+						Else
+							g_GraphicsOutput.RevertBackgroundColorAfterSave(g_FileIO.SaveFile(g_GraphicsOutput.GrabOutputForSaving()))
+						EndIf
+						Continue
 					'Scale
 					Case g_UserInterface.m_SettingsZoomTextbox
 						g_UserInterface.SetZoomTextboxValue(g_GraphicsOutput.SetInputZoom(g_UserInterface.GetZoomTextboxValue()))

types/FileIO.bmx

@@ -5,7 +5,7 @@ Import "IndexedImageWriter.bmx"
 
 Type FileIO
 	Field m_ImportedFile:String = Null
-	Field m_FileFilters:String
+	Field m_FileFilters:String = "Image Files:png"
 
 	Field m_SaveAsIndexed:Int = False
 	Field m_SaveAsFrames:Int = False
@@ -38,6 +38,12 @@ Type FileIO
 		Return m_ImportedFile
 	EndMethod
 
+'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	Method GetSaveAsFrames:Int()
+		Return m_SaveAsFrames
+	EndMethod
+
 '////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	Method SetSaveAsFrames:Int(framesOrNot:Int)

types/GraphicsOutput.bmx

@@ -63,6 +63,12 @@ Type GraphicsOutput
 		Return m_InputZoom
 	EndMethod
 
+'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	Method GetFrameCount:Int()
+		Return m_FrameCount
+	EndMethod
+
 '////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	Method SetFrameCount:Int(newCount:Int)
@@ -76,6 +82,14 @@ Type GraphicsOutput
 		SetClsColor(rgbValue[0], rgbValue[1], rgbValue[2])
 	EndMethod
 
+'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	Method RevertBackgroundColorAfterSave(revertOrNot:Int)
+		If revertOrNot Then
+			ChangeBackgroundColor(m_BackgroundColor)
+		EndIf
+	EndMethod
+
 '////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	Method SetDrawOutputFrameBounds(drawOrNot:Int)
@@ -92,7 +106,6 @@ Type GraphicsOutput
 				m_LimbManager.SetJointMarker(mousePos)
 			EndIf
 		EndIf
-		ChangeBackgroundColor(m_BackgroundColor)
 	EndMethod
 
 '////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -136,36 +149,40 @@ Type GraphicsOutput
 
 '////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	Method GrabOutputForSaving()
-		Rem
-
+	Method GrabOutputForSaving:TPixmap()
 		If m_SourceImage = Null Then
 			Notify("Nothing to save!", False)
 		Else
 			ChangeBackgroundColor(c_Magenta)
 			Draw()
+			Flip(1) 'Have to flip again for background color to actually change, not sure why but whatever
+			Return GrabPixmap(55, 120, 34 * m_FrameCount, 210)
+		EndIf
+	EndMethod
 
-			If Not g_FileIO.m_SaveAsFrames Then
-				g_FileIO.SaveFile(GrabPixmap(55, 120, 34 * m_FrameCount, 210))
-			Else
-				Local framesToSave:TPixmap[c_LimbCount, m_FrameCount]
-				For Local row:Int = 0 To 3
-					For Local frame:Int = 0 To m_FrameCount - 1
-						'Grab pixmap inside tile bounds for saving
-						framesToSave[row, frame] = GrabPixmap(63 + (frame * (m_TileSize / m_InputZoom + 8)), 139 + (row * 48), m_TileSize / m_InputZoom, m_TileSize / m_InputZoom)
-						'HFlip the legs so they're facing right
-						If row >= 2 Then
-							framesToSave[row, frame] = XFlipPixmap(framesToSave[row, frame])
-						EndIf
-					Next
-				Next
-				g_FileIO.SaveFileAsFrames(framesToSave, m_FrameCount)
-			EndIf
+'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-			ChangeBackgroundColor(m_BackgroundColor)
+	Method GrabOutputFramesForSaving:TPixmap[,]()
+		If m_SourceImage = Null Then
+			Notify("Nothing to save!", False)
+		Else
+			ChangeBackgroundColor(c_Magenta)
+			Draw()
+			Flip(1) 'Have to flip again for background color to actually change, not sure why but whatever
+
+			Local framesToSave:TPixmap[c_LimbCount, m_FrameCount]
+			For Local row:Int = 0 To 3
+				For Local frame:Int = 0 Until m_FrameCount
+					'Grab pixmap inside tile bounds for saving
+					framesToSave[row, frame] = GrabPixmap(63 + (frame * (m_TileSize / m_InputZoom + 8)), 139 + (row * 48), m_TileSize / m_InputZoom, m_TileSize / m_InputZoom)
+					'HFlip the legs so they're facing right
+					If row >= 2 Then
+						framesToSave[row, frame] = XFlipPixmap(framesToSave[row, frame])
+					EndIf
+				Next
+			Next
+			Return framesToSave
 		EndIf
-
-		EndRem
 	EndMethod
 
 '////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

types/UserInterface.bmx

@@ -137,6 +137,7 @@ Type UserInterface
 		SetGadgetLayout(m_CanvasGraphics, m_CanvasGraphicsAnchor[0], m_CanvasGraphicsSize[0], m_CanvasGraphicsAnchor[1], m_CanvasGraphicsSize[1])
 		SetGraphicsDriver(GLMax2DDriver())
 		SetGraphics(CanvasGraphics(m_CanvasGraphics))
+		SetClsColor(GadgetText(m_SettingsColorRTextbox).ToInt(), GadgetText(m_SettingsColorGTextbox).ToInt(), GadgetText(m_SettingsColorBTextbox).ToInt())
 	EndMethod
 
 '////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////