Merge pull request #1 from Jorolf/vitaruRemake

Vitaru Base, Rewrite Incoming

osu.Desktop/Overlays/VersionManager.cs

@@ -61,13 +61,13 @@ private void load(NotificationManager notification, OsuColour colours, TextureSt
                 new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
-                    Direction = FillDirection.Down,
+                    Direction = FillDirection.Vertical,
                     Children = new Drawable[]
                     {
                         new FillFlowContainer
                         {
                             AutoSizeAxes = Axes.Both,
-                            Direction = FillDirection.Right,
+                            Direction = FillDirection.Horizontal,
                             Spacing = new Vector2(5),
                             Anchor = Anchor.TopCentre,
                             Origin = Anchor.TopCentre,

osu.Desktop/Program.cs

@@ -12,6 +12,7 @@
 using osu.Game.Modes.Mania;
 using osu.Game.Modes.Osu;
 using osu.Game.Modes.Taiko;
+using osu.Game.Modes.Vitaru;
 
 namespace osu.Desktop
 {
@@ -45,6 +46,7 @@ public static int Main(string[] args)
                     Ruleset.Register(new TaikoRuleset());
                     Ruleset.Register(new ManiaRuleset());
                     Ruleset.Register(new CatchRuleset());
+                    Ruleset.Register(new VitaruRuleset());
 
                     host.Run(new OsuGameDesktop(args));
                 }

osu.Desktop/osu.Desktop.csproj

@@ -214,6 +214,10 @@
       <Project>{f167e17a-7de6-4af5-b920-a5112296c695}</Project>
       <Name>osu.Game.Modes.Taiko</Name>
     </ProjectReference>
+    <ProjectReference Include="..\osu.Game.Modes.Vitaru\osu.Game.Modes.Vitaru.csproj">
+      <Project>{9a615027-b2ab-435e-b865-0c7209933457}</Project>
+      <Name>osu.Game.Modes.Vitaru</Name>
+    </ProjectReference>
     <ProjectReference Include="..\osu.Game\osu.Game.csproj">
       <Project>{0d3fbf8a-7464-4cf7-8c90-3e7886df2d4d}</Project>
       <Name>osu.Game</Name>

osu.Desktop/osu.nuspec

@@ -17,7 +17,8 @@
     </metadata>
     <files>
       <file src="*.exe" target="lib\net45\" exclude="**vshost**"/>
-      <file src="*.dll" target="lib\net45\"/>
+      <file src="*.dll" target="lib\net45\"/>
+      <file src="*.config" target="lib\net45\"/>
       <file src="x86\*.dll" target="lib\net45\x86\"/>
       <file src="x64\*.dll" target="lib\net45\x64\"/>
     </files>

osu.Game.Modes.Osu/Objects/Drawables/HitExplosion.cs

@@ -25,7 +25,7 @@ public HitExplosion(OsuJudgementInfo judgement, OsuHitObject h = null)
             AutoSizeAxes = Axes.Both;
             Origin = Anchor.Centre;
 
-            Direction = FillDirection.Down;
+            Direction = FillDirection.Vertical;
             Spacing = new Vector2(0, 2);
             Position = (h?.StackedEndPosition ?? Vector2.Zero) + judgement.PositionOffset;
 

osu.Game.Modes.Osu/OsuScoreProcessor.cs

@@ -12,6 +12,7 @@ public OsuScoreProcessor(int hitObjectCount)
             : base(hitObjectCount)
         {
             Health.Value = 1;
+            Accuracy.Value = 1;
         }
 
         protected override void UpdateCalculations(JudgementInfo judgement)

osu.Game.Modes.Vitaru/Objects/Character.cs

@@ -0,0 +1,15 @@
+using osu.Framework.Graphics.Containers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace osu.Game.Modes.Vitaru.UI
+{
+    class Character : Container
+    {
+
+
+    }
+}

osu.Game.Modes.Vitaru/Objects/VitaruHitObject.cs

@@ -0,0 +1,8 @@
+using osu.Game.Modes.Objects;
+
+namespace osu.Game.Modes.Vitaru.UI
+{
+    public class VitaruHitObject : HitObject
+    {
+    }
+}

osu.Game.Modes.Vitaru/OpenTK.dll.config

@@ -0,0 +1,29 @@
+<!--
+Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+-->
+
+<configuration>
+  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
+  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
+  <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
+  <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
+  <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
+  <dllmap os="linux" dll="libX11" target="libX11.so.6"/>
+  <dllmap os="linux" dll="libXi" target="libXi.so.6"/>
+  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
+  <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
+  <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
+  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
+  <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
+  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
+  <!-- XQuartz compatibility (X11 on Mac) -->
+  <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
+  <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
+  <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
+  <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
+  <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
+  <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
+</configuration>

osu.Game.Modes.Vitaru/Properties/AssemblyInfo.cs

@@ -0,0 +1,39 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <[email protected]>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("osu.Game.Modes.Vitaru")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("osu.Game.Modes.Vitaru")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("58f6c80c-1253-4a0e-a465-b8c85ebeadf3")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

osu.Game.Modes.Vitaru/UI/VitaruComboCounter.cs

@@ -0,0 +1,14 @@
+//Copyright (c) 2007-2017 ppy Pty Ltd <[email protected]>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+
+
+using osu.Framework.Graphics.Containers;
+
+namespace osu.Game.Modes.Vitaru.UI
+{
+    public class VitaruComboCounter : Container
+    {
+
+    }
+}

osu.Game.Modes.Vitaru/UI/VitaruHitObjectConverter.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using osu.Game.Beatmaps;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Vitaru.UI;
+
+namespace osu.Game.Modes.Vitaru.UI
+{
+    internal class VitaruHitObjectConverter : HitObjectConverter<VitaruHitObject>
+    {
+        public override List<VitaruHitObject> Convert(Beatmap beatmap)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

osu.Game.Modes.Vitaru/UI/VitaruJudgementInfo.cs

@@ -0,0 +1,13 @@
+using System;
+using osu.Game.Modes.Objects.Drawables;
+
+namespace osu.Game.Modes.Vitaru.UI
+{
+    internal class VitaruJudgementInfo
+    {
+        public static explicit operator VitaruJudgementInfo(JudgementInfo v)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

osu.Game.Modes.Vitaru/UI/VitaruObjectRenderer.cs

@@ -0,0 +1,27 @@
+//Copyright (c) 2007-2017 ppy Pty Ltd <[email protected]>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Vitaru.UI;
+using osu.Game.Modes.Vitaru.UI;
+using osu.Game.Modes.UI;
+using System.Collections.Generic;
+
+namespace osu.Game.Modes.Vitaru.UI
+{
+    /*public class VitaruObjectRenderer : HitRenderer<VitaruHitObject>
+    {
+        public List<HitObject> Character { get; internal set; }
+
+        protected override HitObjectConverter<VitaruHitObject> Converter => new VitaruHitObjectConverter();
+
+        protected override Playfield CreatePlayfield() => new VitaruPlayfield();
+
+        protected override DrawableHitObject GetVisualRepresentation(VitaruHitObject h)
+        {
+
+        }
+    }*/
+}

osu.Game.Modes.Vitaru/UI/VitaruPlayfield.cs

@@ -0,0 +1,78 @@
+//Copyright (c) 2007-2017 ppy Pty Ltd <[email protected]>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Modes.Objects.Drawables;
+using osu.Game.Modes.Vitaru.UI;
+using osu.Game.Modes.UI;
+using System;
+
+namespace osu.Game.Modes.Vitaru.UI
+{
+    public class VitaruPlayfield
+    {/*
+        private Container PlayArea;
+        private Container EnemyArea;
+        private Container JudgementLayer;
+
+        public override Vector2 Size
+        {
+            get
+            {
+                var parentSize = Parent.DrawSize;
+                var aspectSize = parentSize.X * 0.75f < parentSize.Y ? new Vector2(parentSize.X, parentSize.X * 0.75f) : new Vector2(parentSize.Y * 4f / 3f, parentSize.Y);
+
+                return new Vector2(aspectSize.X / parentSize.X, aspectSize.Y / parentSize.Y) * base.Size;
+            }
+        }
+
+        public VitaruPlayfield()
+        {
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+            RelativeSizeAxes = Axes.Both;
+            Size = new Vector2(0.75f);
+
+            Add(new Drawable[]
+            {
+                PlayArea = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = 1,
+                },
+                EnemyArea = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = 1,
+                },
+                JudgementLayer = new Container
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Depth = 1
+                }
+            });
+        }
+
+        public override void Add(DrawableHitObject h)
+        {
+            h.Depth = (float)h.HitObject.StartTime;
+            DrawableEnemy c = h as DrawableEnemy;
+
+
+            h.OnJudgement += judgement;
+
+            base.Add(h);
+        }
+
+        private void judgement(DrawableHitObject arg1, JudgementInfo arg2)
+        {
+            throw new NotImplementedException();
+        }*/
+
+        /*private void judgement(DrawableHitObject h, JudgementInfo j)
+        {
+            DeathSprite explosion = new DeathSprite((VitaruJudgementInfo)j, (VitaruHitObject)h.HitObject);
+        }*/
+    }
+}

osu.Game.Modes.Vitaru/VitaruHitRenderer.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+using osu.Game.Modes.Objects;
+using osu.Game.Modes.UI;
+
+namespace osu.Game.Modes.Vitaru
+{
+    internal class VitaruHitRenderer : HitRenderer
+    {
+        public List<HitObject> Enemy { get; set; }
+    }
+}

osu.Game.Modes.Vitaru/VitaruObjectParser.cs

@@ -0,0 +1,13 @@
+using System;
+using osu.Game.Modes.Objects;
+
+namespace osu.Game.Modes.Vitaru
+{
+    internal class VitaruObjectParser : HitObjectParser
+    {
+        public override HitObject Parse(string text)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}