Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changes #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Fighter/Fighter.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fighter", "Fighter\Fighter.vcxproj", "{2A5B3CB4-1E6F-4AEA-8193-5382A519133C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2A5B3CB4-1E6F-4AEA-8193-5382A519133C}.Debug|Win32.ActiveCfg = Debug|Win32
{2A5B3CB4-1E6F-4AEA-8193-5382A519133C}.Debug|Win32.Build.0 = Debug|Win32
{2A5B3CB4-1E6F-4AEA-8193-5382A519133C}.Release|Win32.ActiveCfg = Release|Win32
{2A5B3CB4-1E6F-4AEA-8193-5382A519133C}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
12 changes: 12 additions & 0 deletions Fighter/Fighter/Bullet.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#include "Bullet.h"
#include "Texture.h"

Bullet::Bullet(float x,float y){
this->setTexture(Texture::BULLET);

this->setPosition(x, y);
}

void Bullet::heartBeat(){
this->move(0,-10);
}
12 changes: 12 additions & 0 deletions Fighter/Fighter/Bullet.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#ifndef __Fighters__Bullet__
#define __Fighters__Bullet__

#include "Sprite.h"

class Bullet:public Sprite{
public:
Bullet(float x,float y);
void heartBeat();
};

#endif /* defined(__Fighters__Bullet__) */
56 changes: 56 additions & 0 deletions Fighter/Fighter/Enemy.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#include "Enemy.h"
#include "Texture.h"
#include "Sound.h"
#include "Game.h"
#include <random>
#include <iostream>
using namespace std;

Enemy::Enemy(){
this->setTexture(Texture::ENEMY);

uniform_int_distribution<unsigned> u(0,440);
uniform_int_distribution<unsigned> v(0,1);
std::default_random_engine random_engine;
this->setPosition(u(Game::random_engine), 20);
this->speed = 0.5+(double)(v(Game::random_engine)/1.5);
this->gun.setOwner(this);
}

void Enemy::heartBeat(){
float y;
switch(this->state){
case 0:
y=this->getPosition().y;
if (y >= 700) this->state = 4;
else this->move(0,this->speed);
break;
case 1:
this->setTexture(Texture::ENEMY_DOWN_2);
this->state++;
break;
case 2:
this->setTexture(Texture::ENEMY_DOWN_3);
this->state++;
break;
case 3:
this->setTexture(Texture::ENEMY_DOWN_4);
this->state++;
break;
default:;
}
}

void Enemy::hit(){
this->state = 1;
this->setTexture(Texture::ENEMY_DOWN_1);
Sound::ENEMY_DOWN.play();
}

bool Enemy::needClear(){
return this->state == 4;
}

bool Enemy::isDead(){
return this->state != 0;
}
18 changes: 18 additions & 0 deletions Fighter/Fighter/Enemy.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#ifndef __Fighters__Enemy__
#define __Fighters__Enemy__

#include "Plane.h"

class Enemy:public Plane{
public:
Enemy();
void heartBeat();
void hit();
bool needClear();
bool isDead();
private:
int state=0;
double speed;
};

#endif /* defined(__Fighters__Enemy__) */
110 changes: 110 additions & 0 deletions Fighter/Fighter/Fighter.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{2A5B3CB4-1E6F-4AEA-8193-5382A519133C}</ProjectGuid>
<RootNamespace>Fighter</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>E:\Soft\SFML-2.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>E:\Soft\SFML-2.1\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>sfml-audio-d.lib;sfml-system-d.lib;sfml-graphics-d.lib;sfml-window-d.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>E:\Soft\SFML-2.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>E:\Soft\SFML-2.1\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>sfml-audio.lib;sfml-system.lib;sfml-graphics.lib;sfml-window.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Bullet.cpp" />
<ClCompile Include="Enemy.cpp" />
<ClCompile Include="Game.cpp" />
<ClCompile Include="Gun.cpp" />
<ClCompile Include="Hero.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="Plane.cpp" />
<ClCompile Include="Rect.cpp" />
<ClCompile Include="ResourcePath.cpp" />
<ClCompile Include="Sky.cpp" />
<ClCompile Include="Sound.cpp" />
<ClCompile Include="Sprite.cpp" />
<ClCompile Include="Texture.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Bullet.h" />
<ClInclude Include="Enemy.h" />
<ClInclude Include="Game.h" />
<ClInclude Include="Gun.h" />
<ClInclude Include="Hero.h" />
<ClInclude Include="Plane.h" />
<ClInclude Include="Rect.h" />
<ClInclude Include="ResourcePath.hpp" />
<ClInclude Include="Sky.h" />
<ClInclude Include="Sound.h" />
<ClInclude Include="Sprite.h" />
<ClInclude Include="Texture.h" />
</ItemGroup>
<ItemGroup>
<None Include="Fighters-Info.plist">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
101 changes: 101 additions & 0 deletions Fighter/Fighter/Fighter.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Bullet.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="Enemy.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="Game.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="Gun.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="Hero.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="main.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="Plane.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="Rect.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="Sky.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="Sound.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="Sprite.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="Texture.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
<ClCompile Include="ResourcePath.cpp">
<Filter>Resource Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Bullet.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Enemy.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Game.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Gun.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Hero.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Plane.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Rect.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Sky.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Sound.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Sprite.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Texture.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="ResourcePath.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="Fighters-Info.plist">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
</Project>
22 changes: 22 additions & 0 deletions Fighter/Fighter/Fighters-Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>uestc.cpp.edu.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
</dict>
</plist>
11 changes: 11 additions & 0 deletions Fighter/Fighter/Game.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#include "Game.h"

Game* Game::instance = nullptr;
std::default_random_engine Game::random_engine(time(0));

Game* Game::getInstance(){
if(!instance){
instance = new Game;
}
return instance;
}
17 changes: 17 additions & 0 deletions Fighter/Fighter/Game.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#ifndef __Fighters__Game__
#define __Fighters__Game__

#include <random>
#include <ctime>

class Game{
public:
static Game* getInstance();
static std::default_random_engine random_engine;
private:
// Game();

static Game* instance;
};

#endif /* defined(__Fighters__Game__) */
Loading