Game-Decompilation/Braver
1
0
Fork 0
mirror of https://github.com/ficed/Braver.git synced 2024-11-26 22:50:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix GLTF plugin not disposing resources properly

Browse Source 
Add better field autosave options
This commit is contained in:
ficedula 2023-09-24 11:05:34 +01:00
parent 0ce8708334
commit e8dc0b8858
8 changed files with 65 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Braver.Core/BGame.cs
View File

@ -88,11 +88,17 @@ namespace Braver {
public override string ToString() => $"File source {_root}";
}
public enum FieldAutoSaveType {
None,
MostRecent3,
AllByLocationAndPPV,
}
public class GameOptions {
public bool NoFieldScripts { get; set; }
public bool NoRandomBattles { get; set; }
public bool SkipBattleMenu { get; set; }
public bool AutoSaveOnFieldEntry { get; set; }
public FieldAutoSaveType AutoSaveOnFieldEntry { get; set; }
public bool SeparateSaveFiles { get; set; }
public float MusicVolume { get; set; } = 1f;
public int BattleSpeed { get; set; } = 128;
@ -106,6 +112,8 @@ namespace Braver {
prop.SetValue(this, float.Parse(value));
else if (prop.PropertyType == typeof(int))
prop.SetValue(this, int.Parse(value));
else if (prop.PropertyType.IsEnum)
prop.SetValue(this, Enum.Parse(prop.PropertyType, value));
else
throw new NotImplementedException();
}

20
Braver/FGame.cs
View File

@ -247,13 +247,21 @@ namespace Braver {
NetConfig = new Net.NetConfig();
}
public void AutoSave() {
public void AutoSave(string location) {
string path = GetPath("save");
foreach (string file1 in Directory.GetFiles(path, "auto1.*"))
File.Move(file1, Path.Combine(path, "auto2" + Path.GetExtension(file1)), true);
foreach (string file0 in Directory.GetFiles(path, "auto.*"))
File.Move(file0, Path.Combine(path, "auto1" + Path.GetExtension(file0)), true);
Save(Path.Combine(path, "auto"), !GameOptions.SeparateSaveFiles);
switch (GameOptions.AutoSaveOnFieldEntry) {
case FieldAutoSaveType.MostRecent3:
foreach (string file1 in Directory.GetFiles(path, "auto1.*"))
File.Move(file1, Path.Combine(path, "auto2" + Path.GetExtension(file1)), true);
foreach (string file0 in Directory.GetFiles(path, "auto.*"))
File.Move(file0, Path.Combine(path, "auto1" + Path.GetExtension(file0)), true);
Save(Path.Combine(path, "auto"), !GameOptions.SeparateSaveFiles);
break;
case FieldAutoSaveType.AllByLocationAndPPV:
Save(Path.Combine(path, $"auto_{location}_{SaveMap.PPV}"), !GameOptions.SeparateSaveFiles);
break;
}
}
public Stream WriteDebugBData(string category, string file) {

11
Braver/Field/FieldScreen.cs
View File

@ -157,11 +157,6 @@ namespace Braver.Field {
public override void Init(FGame g, GraphicsDevice graphics) {
base.Init(g, graphics);
UpdateSaveLocation();
if (g.GameOptions.AutoSaveOnFieldEntry && !_isFirstLoad)
Game.AutoSave();
_isFirstLoad = false;
g.Net.Listen<Net.FieldModelMessage>(this);
g.Net.Listen<Net.FieldBGMessage>(this);
g.Net.Listen<Net.FieldEntityModelMessage>(this);
@ -177,6 +172,12 @@ namespace Braver.Field {
var mapList = g.Singleton(() => new MapList(g.Open("field", "maplist")));
_file = mapList.Items[_destination.DestinationFieldID];
UpdateSaveLocation();
if (!_isFirstLoad)
Game.AutoSave(_file);
_isFirstLoad = false;
var cached = g.Singleton(() => new CachedField());
if (cached.FieldID == _destination.DestinationFieldID)
field = cached.FieldFile;

2
Braver/Properties/launchSettings.json
View File

@ -2,7 +2,7 @@
"profiles": {
"Braver": {
"commandName": "Project",
"commandLineArgs": "_debughost=localhost port=12508 key=GBGSTWNV ff7=C:\\games\\ff7 braver=C:\\Users\\ficed\\Projects\\F7\\data xbraver=C:\\Users\\ficed\\Projects\\F7\\temp xbdata=C:\\temp\\data.bpack _Options.AutoSaveOnFieldEntry=true Options.SeparateSaveFiles=true save=C:\\Users\\ficed\\AppData\\Roaming\\Braver\\save movies=C:\\games\\FF7\\data\\movies music=C:\\games\\FF7\\data\\music_ogg ff7exe=C:\\games\\FF7\\ff7.exe Options.MusicVolume=0.2 plugins=C:\\Users\\ficed\\Projects\\F7\\Braver\\bin\\Debug\\net7.0-windows\\plugins"
"commandLineArgs": "_debughost=localhost port=12508 key=GBGSTWNV ff7=C:\\games\\ff7 braver=C:\\Users\\ficed\\Projects\\F7\\data xbraver=C:\\Users\\ficed\\Projects\\F7\\temp xbdata=C:\\temp\\data.bpack Options.AutoSaveOnFieldEntry=AllByLocationAndPPV Options.SeparateSaveFiles=true save=C:\\Users\\ficed\\AppData\\Roaming\\Braver\\save movies=C:\\games\\FF7\\data\\movies music=C:\\games\\FF7\\data\\music_ogg ff7exe=C:\\games\\FF7\\ff7.exe Options.MusicVolume=0.2 plugins=C:\\Users\\ficed\\Projects\\F7\\Braver\\bin\\Debug\\net7.0-windows\\plugins"
}
}
}

12
Braver/UI/Layout/Debug.cs
View File

@ -33,8 +33,9 @@ namespace Braver.UI.Layout {
DoLabel(lNoFieldScripts, Game.GameOptions.NoFieldScripts);
DoLabel(lNoRandomBattles, Game.GameOptions.NoRandomBattles);
DoLabel(lSkipBattleMenu, Game.GameOptions.SkipBattleMenu);
DoLabel(lAutoSaveOnFieldEntry, Game.GameOptions.AutoSaveOnFieldEntry);
DoLabel(lSeparateSaveFiles, Game.GameOptions.SeparateSaveFiles);
lAutoSaveOnFieldEntry.Text = $"Auto Save on Field Entry: {Game.GameOptions.AutoSaveOnFieldEntry}";
}
public void LabelClick(Label L) {
@ -44,9 +45,12 @@ namespace Braver.UI.Layout {
Game.GameOptions.NoRandomBattles = !Game.GameOptions.NoRandomBattles;
else if (L == lSkipBattleMenu)
Game.GameOptions.SkipBattleMenu = !Game.GameOptions.SkipBattleMenu;
else if (L == lAutoSaveOnFieldEntry)
Game.GameOptions.AutoSaveOnFieldEntry = !Game.GameOptions.AutoSaveOnFieldEntry;
else if (L == lSeparateSaveFiles)
else if (L == lAutoSaveOnFieldEntry) {
int maxValue = Enum.GetValues<FieldAutoSaveType>()
.Select(e => (int)e)
.Max();
Game.GameOptions.AutoSaveOnFieldEntry = (FieldAutoSaveType)(((int)Game.GameOptions.AutoSaveOnFieldEntry + 1) % (maxValue + 1));
} else if (L == lSeparateSaveFiles)
Game.GameOptions.SeparateSaveFiles = !Game.GameOptions.SeparateSaveFiles;
Update();

9
Braver/UI/Splash.cs
View File

@ -110,9 +110,12 @@ namespace Braver.UI {
break;
case 1:
string autoPath = System.IO.Path.Combine(Game.GetPath("save"), "auto");
if (System.IO.File.Exists(autoPath + ".sav"))
Game.Load(autoPath);
var mostRecent = System.IO.Directory.GetFiles(Game.GetPath("save"), "*.sav")
.Select(fn => new System.IO.FileInfo(fn))
.OrderByDescending(info => info.LastWriteTime)
.FirstOrDefault();
if (mostRecent != null)
Game.Load(System.IO.Path.ChangeExtension(mostRecent.FullName, "").TrimEnd('.'));
else
Game.Audio.PlaySfx(Sfx.Invalid, 1f, 0f);
break;

24
PluginImplementations/Braver.GltfLoader/GLTFFieldModel.cs
View File

@ -40,18 +40,30 @@ namespace Braver.Field {
}
}
public class GltfModelLoader : IModelLoader {
public class GltfModelLoader : IModelLoader, IDisposable {
private List<GLTFFieldModel> _models = new();
public void Dispose() {
foreach (var model in _models)
model.Dispose();
_models.Clear();
}
public Plugins.Field.FieldModelRenderer Load(BGame game, string category, string hrc) {
using (var s = game.TryOpen(category, Path.ChangeExtension(hrc, ".glb"))) {
if (s != null)
return new GLTFFieldModel();
if (s != null) {
var model = new GLTFFieldModel();
_models.Add(model);
return model;
}
}
return null;
}
}
internal class GLTFFieldModel : Plugins.Field.FieldModelRenderer {
internal class GLTFFieldModel : Plugins.Field.FieldModelRenderer, IDisposable {
private SharpGLTF.Runtime.MonoGameDeviceContent<SharpGLTF.Runtime.MonoGameModelTemplate> _content;
private SharpGLTF.Runtime.MonoGameModelInstance _model;
@ -160,5 +172,9 @@ namespace Braver.Field {
//_model.Template._Meshes[0].Effects.First().
_model.Draw(projection, view, transform);
}
public void Dispose() {
_content.Dispose();
}
}
}

2
data/layout/debug.xml
View File

@ -6,7 +6,7 @@
<Component xsi:type="Label" X="200" Y="120" ID="lNoFieldScripts" Click="LabelClick">No Field Scripts</Component>
<Component xsi:type="Label" X="200" Y="160" ID="lNoRandomBattles" Click="LabelClick">No Random Battles</Component>
<Component xsi:type="Label" X="200" Y="200" ID="lSkipBattleMenu" Click="LabelClick">Skip Battle Menu</Component>
<Component xsi:type="Label" X="200" Y="240" ID="lAutoSaveOnFieldEntry" Click="LabelClick">Auto Save on Field Entry</Component>
<Component xsi:type="Label" X="200" Y="240" ID="lAutoSaveOnFieldEntry" Click="LabelClick">(dynamic)</Component>
<Component xsi:type="Label" X="200" Y="280" ID="lSeparateSaveFiles" Click="LabelClick">Separate Save Files</Component>
</Root>