Skip to content

Commit

Permalink
UML & siivous
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jylhis
Jylhis committed Apr 20, 2016
1 parent da6ed29 commit ea632c8
Show file tree
Hide file tree
Showing 20 changed files with 172 additions and 130 deletions.
2 changes: 1 addition & 1 deletion Doc/UML.xml
View file
@@ -1 +1 @@
<mxfile userAgent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36" version="5.4.0.6" editor="www.draw.io" type="device"><diagram>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</diagram></mxfile>
<mxfile userAgent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.75 Safari/537.36" version="5.4.3.1" editor="www.draw.io" type="device"><diagram>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</diagram></mxfile>
2 changes: 1 addition & 1 deletion Game/Bullet.cs
View file
Expand Up @@ -11,7 +11,7 @@

namespace src
{
class Bullet : SDLGameObject
class Bullet : GameObject
{
private UInt32 starttime, ftime;
private const int maxVel = 7;
Expand Down
6 changes: 3 additions & 3 deletions Game/Enemy.cs
View file
Expand Up @@ -11,14 +11,14 @@

namespace src
{
public class Enemy : SDLGameObject
public class Enemy : GameObject
{
private new int health = 100;

public bool IsKill { get; set; }

Random rnd;
UInt32 tTime;
private Random rnd;
private UInt32 tTime;

public Enemy(LoaderParams pParams)
: base(ref pParams)
Expand Down
4 changes: 2 additions & 2 deletions Game/EnemySpawner.cs
View file
Expand Up @@ -12,7 +12,7 @@

namespace src
{
public class EnemySpawner : SDLGameObject
public class EnemySpawner : GameObject
{
private UInt32 starttime, ftime;

Expand Down Expand Up @@ -48,7 +48,7 @@ public override void Update()
public void Spawn()
{
SoundManager.Instance.PlaySound("spawn");
SDLGameObject enemy = new Enemy(new LoaderParams(rect.x, rect.y, 40, 40, "enemy"));
GameObject enemy = new Enemy(new LoaderParams(rect.x, rect.y, 40, 40, "enemy"));
PlayState.gameObjects.Add(enemy);
}
}
Expand Down
6 changes: 3 additions & 3 deletions Game/Engine/SDLGameObject.cs → Game/Engine/GameObject.cs
View file
Expand Up @@ -11,7 +11,7 @@

namespace src
{
public class SDLGameObject
public class GameObject
{
protected int currentRow, currentFrame;
protected Vector2D velocity, acceleration;
Expand Down Expand Up @@ -91,10 +91,10 @@ public Vector2D Position
public string id;

/// <summary>
/// Initializes a new instance of the <see cref="src.SDLGameObject"/> class.
/// Initializes a new instance of the <see cref="src.GameObject"/> class.
/// </summary>
/// <param name="pParams">Parameters.</param>
public SDLGameObject(ref LoaderParams pParams)
public GameObject(ref LoaderParams pParams)
{
Position = new Vector2D(pParams.X, pParams.Y);
velocity = new Vector2D(0, 0);
Expand Down
8 changes: 4 additions & 4 deletions Game/Engine/SoundManager.cs
View file
Expand Up @@ -12,7 +12,7 @@

namespace src
{
public enum sound_type
public enum SoundType
{
/// <summary>
/// Music.
Expand Down Expand Up @@ -53,9 +53,9 @@ public static SoundManager Instance
/// <param name="fileName">File name.</param>
/// <param name="id">Identifier.</param>
/// <param name="type">Type.</param>
public bool Load(string fileName, string id, sound_type type)
public bool Load(string fileName, string id, SoundType type)
{
if (type == sound_type.SOUND_MUSIC)
if (type == SoundType.SOUND_MUSIC)
{
IntPtr music = SDL_mixer.Mix_LoadMUS(fileName);

Expand All @@ -67,7 +67,7 @@ public bool Load(string fileName, string id, sound_type type)
musics[id] = music;
return true;
}
else if (type == sound_type.SOUND_SFX)
else if (type == SoundType.SOUND_SFX)
{
IntPtr pChunk = SDL_mixer.Mix_LoadWAV(fileName);
if (pChunk == IntPtr.Zero)
Expand Down
1 change: 0 additions & 1 deletion Game/Engine/TextureManager.cs
View file
Expand Up @@ -164,4 +164,3 @@ public void ClearFromTextureMap(string id)
}
}
}

75 changes: 38 additions & 37 deletions Game/Engine/Vector2D.cs
View file
Expand Up @@ -33,46 +33,47 @@ public Vector2D(double inx, double iny)
v1.Y += v2.Y;
return v1;
}
/*
/// <param name="v1">V1.</param>
/// <param name="scalar">Scalar.</param>
public static Vector2D operator *(Vector2D v1, float scalar)
{
v1.X *= scalar;
v1.Y *= scalar;
return v1;
}
/// <param name="v1">V1.</param>
/// <param name="scalar">Scalar.</param>
public static Vector2D operator *(Vector2D v1, float scalar)
{
v1.X *= scalar;
v1.Y *= scalar;
return v1;
}
/// <param name="v1">V1.</param>
/// <param name="v2">V2.</param>
public static Vector2D operator -(Vector2D v1, Vector2D v2)
{
v1.X -= v2.X;
v1.Y -= v2.Y;
return v1;
}
/// <param name="v1">V1.</param>
/// <param name="v2">V2.</param>
public static Vector2D operator -(Vector2D v1, Vector2D v2)
{
v1.X -= v2.X;
v1.Y -= v2.Y;
return v1;
}
/// <param name="v1">V1.</param>
/// <param name="scalar">Scalar.</param>
public static Vector2D operator /(Vector2D v1, float scalar)
{
v1.X /= scalar;
v1.Y /= scalar;
return v1;
}
/// <param name="v1">V1.</param>
/// <param name="scalar">Scalar.</param>
public static Vector2D operator /(Vector2D v1, float scalar)
{
v1.X /= scalar;
v1.Y /= scalar;
return v1;
}

/// <summary>
/// Normalize this instance.
/// </summary>
/* public void Normalize()
{
double l = 1 / Length;
if (l > 0)
{
this.X *= l;
this.Y *= l;
}
}*/
/// <summary>
/// Normalize this instance.
/// </summary>
public void Normalize()
{
double l = 1 / Length;
if (l > 0)
{
this.X *= l;
this.Y *= l;
}
}
*/


/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion Game/Game.csproj
View file
Expand Up @@ -77,7 +77,7 @@
<Compile Include="Engine\LoaderParams.cs" />
<Compile Include="Engine\SoundManager.cs" />
<Compile Include="Player.cs" />
<Compile Include="Engine\SDLGameObject.cs" />
<Compile Include="Engine\GameObject.cs" />
<Compile Include="Engine\TextureManager.cs" />
<Compile Include="Engine\Vector2D.cs" />
<Compile Include="Engine\GameState.cs" />
Expand Down
10 changes: 3 additions & 7 deletions Game/GameOverState.cs
View file
Expand Up @@ -14,7 +14,7 @@ namespace src
{
public class GameOverState : GameState
{
private List<SDLGameObject> gameObjects = new List<SDLGameObject>();
private List<GameObject> gameObjects = new List<GameObject>();
private const string menuID = "GAMEOVER";

private static void gameOverToMain()
Expand All @@ -29,10 +29,6 @@ private static void restartPlay()
Game.Instance.GetStateMachine.Change(new PlayState());
}

public GameOverState()
{
}

public override void Update()
{
for (int i = 0; i < gameObjects.Count; i++)
Expand Down Expand Up @@ -69,8 +65,8 @@ public override bool OnEnter()
return false;
}

SDLGameObject button1 = new MenuButton(new LoaderParams(320, 400, 380, 203, "mainbutton"), gameOverToMain);
SDLGameObject button2 = new MenuButton(new LoaderParams(320, 100, 380, 203, "restartbutton"), restartPlay);
GameObject button1 = new MenuButton(new LoaderParams(320, 400, 380, 203, "mainbutton"), gameOverToMain);
GameObject button2 = new MenuButton(new LoaderParams(320, 100, 380, 203, "restartbutton"), restartPlay);

gameObjects.Add(button1);
gameObjects.Add(button2);
Expand Down

0 comments on commit ea632c8

Please sign in to comment.