Restructured Solution Layout

Moved several enums and helper classes into the QURO library for flexibility and potential reuse.

Also solved desync in animations by making AnimatedSprites reset their timer every time a new animation is loaded.
This commit is contained in:
quinnvoker committed 2018-11-17 20:54:01 -08:00
1 parent fb85769677
commit 9a25f068fc
9 files changed
+40 -13

No files matched your search

+5 -1
View File
@@ -56,10 +56,14 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AnimationLibrary\QURO.AnimationLibrary.csproj">
<ProjectReference Include="..\QURO.AnimationLibrary\QURO.AnimationLibrary.csproj">
<Project>{69dadc27-fbeb-4625-9212-6eb5bed5102a}</Project>
<Name>QURO.AnimationLibrary</Name>
</ProjectReference>
<ProjectReference Include="..\QURO\QURO.csproj">
<Project>{4581e0c8-b14a-454d-9a7b-52d37535e7e9}</Project>
<Name>QURO</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Content\boardMap.xml">
+11 -10
View File
@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Xml;
using QURO;
using QURO.AnimationLibrary;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content.Pipeline.Serialization.Intermediate;
@@ -26,15 +27,15 @@ namespace AnimationGenerator
Frame[] soloCursor_pulse_frames = new Frame[]
{
new Frame(loadedFrames["soloCursor"], 20f / 60f),
new Frame(loadedFrames["soloCursor_pulse"], 20f / 60f),
new Frame(loadedFrames["soloCursor"], FrameTime.FramesToSeconds(20)),
new Frame(loadedFrames["soloCursor_pulse"], FrameTime.FramesToSeconds(20)),
};
output.Add(new Animation("soloCursor_pulse", soloCursor_pulse_frames, true));
Frame[] twinCursor_pulse_frames = new Frame[]
{
new Frame(loadedFrames["twinCursor"], 20f / 60f),
new Frame(loadedFrames["twinCursor_pulse"], 20f / 60f),
new Frame(loadedFrames["twinCursor"], FrameTime.FramesToSeconds(20)),
new Frame(loadedFrames["twinCursor_pulse"], FrameTime.FramesToSeconds(20)),
};
output.Add(new Animation("twinCursor_pulse", twinCursor_pulse_frames, true));
@@ -73,12 +74,12 @@ namespace AnimationGenerator
Frame[] block_bounce_frames = new Frame[]
{
new Frame(loadedFrames["block0_bounce2"], 1f / 60f),
new Frame(loadedFrames["block0"], 1f / 60f),
new Frame(loadedFrames["block0_squish"], 1f / 60f),
new Frame(loadedFrames["block0"], 1f / 60f),
new Frame(loadedFrames["block0_bounce1"], 2f / 60f),
new Frame(loadedFrames["block0"], 1f / 60f),
new Frame(loadedFrames["block0_bounce2"], FrameTime.FramesToSeconds(1)),
new Frame(loadedFrames["block0"], FrameTime.FramesToSeconds(1)),
new Frame(loadedFrames["block0_squish"], FrameTime.FramesToSeconds(1)),
new Frame(loadedFrames["block0"], FrameTime.FramesToSeconds(1)),
new Frame(loadedFrames["block0_bounce1"], FrameTime.FramesToSeconds(2)),
new Frame(loadedFrames["block0"], FrameTime.FramesToSeconds(0)),
};
output.Add(new Animation("block_bounce", block_bounce_frames, false));