Visual Studio refactoring
Vectozavr
parent
59e8887eaf
commit
d2ced42562
|
|
@ -73,7 +73,7 @@ void Engine::create(int screenWidth, int screenHeight, const std::string &name,
|
|||
}
|
||||
|
||||
if (Consts::SHOW_FPS_COUNTER) {
|
||||
screen->drawText(std::to_string(Time::fps()) + " fps", Vec2D(screen->width() - 100, 10), 25,
|
||||
screen->drawText(std::to_string(Time::fps()) + " fps", Vec2D(static_cast<double>(screen->width()) - 100.0, 10.0), 25,
|
||||
sf::Color(100, 100, 100));
|
||||
}
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ void Engine::printDebugText() const {
|
|||
if (_useOpenGL) {
|
||||
text += "\n Using OpenGL acceleration";
|
||||
} else {
|
||||
text += "\n" + std::to_string((int) _triPerSec) + " tris/s";
|
||||
text += "\n" + std::to_string( _triPerSec) + " tris/s";
|
||||
}
|
||||
|
||||
sf::Text t;
|
||||
|
|
@ -120,7 +120,7 @@ void Engine::printDebugText() const {
|
|||
t.setString(text);
|
||||
t.setCharacterSize(30);
|
||||
t.setFillColor(sf::Color::Black);
|
||||
t.setPosition(screen->width() - 400, 10);
|
||||
t.setPosition(static_cast<float>(screen->width()) - 400.0f, 10.0f);
|
||||
|
||||
screen->drawText(t);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ class Engine {
|
|||
private:
|
||||
std::string _name;
|
||||
|
||||
double _triPerSec = 0;
|
||||
int _triPerSec = 0;
|
||||
bool _updateWorld = true;
|
||||
bool _debugText = Consts::SHOW_DEBUG_INFO;
|
||||
bool _useOpenGL = Consts::USE_OPEN_GL;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
// Created by Иван Ильин on 15.03.2021.
|
||||
//
|
||||
|
||||
#include <stdexcept>
|
||||
|
||||
#include "Object.h"
|
||||
#include "Matrix4x4.h"
|
||||
|
||||
|
|
@ -135,25 +137,25 @@ void Object::unattach(const ObjectNameTag &tag) {
|
|||
GLfloat *Object::glView() const {
|
||||
auto *v = (GLfloat *) malloc(4 * 4 * sizeof(GLfloat));
|
||||
|
||||
v[0] = -(GLfloat) left().x();
|
||||
v[4] = -(GLfloat) left().y();
|
||||
v[8] = -(GLfloat) left().z();
|
||||
v[12] = (GLfloat) position().dot(left());
|
||||
v[0] = -static_cast<GLfloat>(left().x());
|
||||
v[4] = -static_cast<GLfloat>(left().y());
|
||||
v[8] = -static_cast<GLfloat>(left().z());
|
||||
v[12] = static_cast<GLfloat>(position().dot(left()));
|
||||
|
||||
v[1] = (GLfloat) up().x();
|
||||
v[5] = (GLfloat) up().y();
|
||||
v[9] = (GLfloat) up().z();
|
||||
v[13] = -(GLfloat) position().dot(up());
|
||||
v[1] = static_cast<GLfloat>(up().x());
|
||||
v[5] = static_cast<GLfloat>(up().y());
|
||||
v[9] = static_cast<GLfloat>(up().z());
|
||||
v[13] = -static_cast<GLfloat>(position().dot(up()));
|
||||
|
||||
v[2] = -(GLfloat) lookAt().x();
|
||||
v[6] = -(GLfloat) lookAt().y();
|
||||
v[10] = -(GLfloat) lookAt().z();
|
||||
v[14] = (GLfloat) position().dot(lookAt());
|
||||
v[2] = -static_cast<GLfloat>(lookAt().x());
|
||||
v[6] = -static_cast<GLfloat>(lookAt().y());
|
||||
v[10] = -static_cast<GLfloat>(lookAt().z());
|
||||
v[14] = static_cast<GLfloat>(position().dot(lookAt()));
|
||||
|
||||
v[3] = (GLfloat) 0.0f;
|
||||
v[7] = (GLfloat) 0.0f;
|
||||
v[11] = (GLfloat) 0.0f;
|
||||
v[15] = (GLfloat) 1.0f;
|
||||
v[3] = static_cast<GLfloat>(0.0f);
|
||||
v[7] = static_cast<GLfloat>(0.0f);
|
||||
v[11] = static_cast<GLfloat>(0.0f);
|
||||
v[15] = static_cast<GLfloat>(1.0f);
|
||||
|
||||
return v;
|
||||
}
|
||||
|
|
@ -161,25 +163,25 @@ GLfloat *Object::glView() const {
|
|||
GLfloat *Object::glModel() const {
|
||||
auto *m = (GLfloat *) malloc(4 * 4 * sizeof(GLfloat));
|
||||
|
||||
m[0] = (GLfloat) left().x();
|
||||
m[4] = (GLfloat) up().x();
|
||||
m[8] = (GLfloat) lookAt().x();
|
||||
m[12] = (GLfloat) position().x();
|
||||
m[0] = static_cast<GLfloat>(left().x());
|
||||
m[4] = static_cast<GLfloat>(up().x());
|
||||
m[8] = static_cast<GLfloat>(lookAt().x());
|
||||
m[12] = static_cast<GLfloat>(position().x());
|
||||
|
||||
m[1] = (GLfloat) left().y();
|
||||
m[5] = (GLfloat) up().y();
|
||||
m[9] = (GLfloat) lookAt().y();
|
||||
m[13] = (GLfloat) position().y();
|
||||
m[1] = static_cast<GLfloat>(left().y());
|
||||
m[5] = static_cast<GLfloat>(up().y());
|
||||
m[9] = static_cast<GLfloat>(lookAt().y());
|
||||
m[13] = static_cast<GLfloat>(position().y());
|
||||
|
||||
m[2] = (GLfloat) left().z();
|
||||
m[6] = (GLfloat) up().z();
|
||||
m[10] = (GLfloat) lookAt().z();
|
||||
m[14] = (GLfloat) position().z();
|
||||
m[2] = static_cast<GLfloat>(left().z());
|
||||
m[6] = static_cast<GLfloat>(up().z());
|
||||
m[10] = static_cast<GLfloat>(lookAt().z());
|
||||
m[14] = static_cast<GLfloat>(position().z());
|
||||
|
||||
m[3] = (GLfloat) 0.0f;
|
||||
m[7] = (GLfloat) 0.0f;
|
||||
m[11] = (GLfloat) 0.0f;
|
||||
m[15] = (GLfloat) 1.0f;
|
||||
m[3] = static_cast<GLfloat>(0.0f);
|
||||
m[7] = static_cast<GLfloat>(0.0f);
|
||||
m[11] = static_cast<GLfloat>(0.0f);
|
||||
m[15] = static_cast<GLfloat>(1.0f);
|
||||
|
||||
return m;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ GLfloat *Screen::glMeshToGLfloatArray(std::shared_ptr<Mesh> mesh, const Vec3D &c
|
|||
|
||||
auto *geometry = (GLfloat *) malloc(7 * 3 * triangles.size() * sizeof(GLfloat));
|
||||
|
||||
for (int i = 0; i < triangles.size(); i++) {
|
||||
for (size_t i = 0; i < triangles.size(); i++) {
|
||||
|
||||
int stride = 21 * i;
|
||||
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ std::pair<bool, Simplex> RigidBody::checkGJKCollision(std::shared_ptr<RigidBody>
|
|||
// New direction is towards the origin
|
||||
Vec3D direction = -support;
|
||||
|
||||
int iters = 0;
|
||||
size_t iters = 0;
|
||||
while (iters++ < size() + obj->size()) {
|
||||
support = _support(obj, direction);
|
||||
|
||||
|
|
@ -210,7 +210,7 @@ CollisionPoint RigidBody::EPA(const Simplex &simplex, std::shared_ptr<RigidBody>
|
|||
Vec3D minNormal = normals[minFace].normal;
|
||||
double minDistance = std::numeric_limits<double>::max();
|
||||
|
||||
int iters = 0;
|
||||
size_t iters = 0;
|
||||
while (minDistance == std::numeric_limits<double>::max() && iters++ < size() + obj->size()) {
|
||||
minNormal = normals[minFace].normal;
|
||||
minDistance = normals[minFace].distance;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.31727.386
|
|||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shooter", "shooter.vcxproj", "{FA50F969-4847-4EB0-8C67-16E6AC7F5B68}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{106AB912-5FE1-4FF5-98D4-23060692E5C0}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|x64 = Debug|x64
|
||||
|
|
|
|||
|
|
@ -159,8 +159,6 @@
|
|||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="Bonus.cpp" />
|
||||
<ClCompile Include="Client.cpp" />
|
||||
<ClCompile Include="engine\animation\Animation.cpp" />
|
||||
<ClCompile Include="engine\animation\Timeline.cpp" />
|
||||
<ClCompile Include="engine\Camera.cpp" />
|
||||
|
|
@ -180,7 +178,6 @@
|
|||
<ClCompile Include="engine\Object.cpp" />
|
||||
<ClCompile Include="engine\physics\RigidBody.cpp" />
|
||||
<ClCompile Include="engine\Plane.cpp" />
|
||||
<ClCompile Include="engine\Point4D.cpp" />
|
||||
<ClCompile Include="engine\ResourceManager.cpp" />
|
||||
<ClCompile Include="engine\Screen.cpp" />
|
||||
<ClCompile Include="engine\SoundController.cpp" />
|
||||
|
|
@ -189,11 +186,14 @@
|
|||
<ClCompile Include="engine\utils\Time.cpp" />
|
||||
<ClCompile Include="engine\Vec2D.cpp" />
|
||||
<ClCompile Include="engine\Vec3D.cpp" />
|
||||
<ClCompile Include="engine\Vec4D.cpp" />
|
||||
<ClCompile Include="engine\World.cpp" />
|
||||
<ClCompile Include="Player.cpp" />
|
||||
<ClCompile Include="PlayerController.cpp" />
|
||||
<ClCompile Include="Server.cpp" />
|
||||
<ClCompile Include="Shooter.cpp" />
|
||||
<ClCompile Include="ShooterClient.cpp" />
|
||||
<ClCompile Include="ShooterMsgType.cpp" />
|
||||
<ClCompile Include="ShooterServer.cpp" />
|
||||
<ClCompile Include="Source.cpp" />
|
||||
<ClCompile Include="weapon\Ak47.cpp" />
|
||||
<ClCompile Include="weapon\Gun.cpp" />
|
||||
|
|
@ -202,8 +202,6 @@
|
|||
<ClCompile Include="weapon\Weapon.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="Bonus.h" />
|
||||
<ClInclude Include="Client.h" />
|
||||
<ClInclude Include="engine\animation\AColor.h" />
|
||||
<ClInclude Include="engine\animation\AFunction.h" />
|
||||
<ClInclude Include="engine\animation\Animation.h" />
|
||||
|
|
@ -233,7 +231,6 @@
|
|||
<ClInclude Include="engine\physics\RigidBody.h" />
|
||||
<ClInclude Include="engine\physics\Simplex.h" />
|
||||
<ClInclude Include="engine\Plane.h" />
|
||||
<ClInclude Include="engine\Point4D.h" />
|
||||
<ClInclude Include="engine\ResourceManager.h" />
|
||||
<ClInclude Include="engine\Screen.h" />
|
||||
<ClInclude Include="engine\SoundController.h" />
|
||||
|
|
@ -242,12 +239,15 @@
|
|||
<ClInclude Include="engine\utils\Time.h" />
|
||||
<ClInclude Include="engine\Vec2D.h" />
|
||||
<ClInclude Include="engine\Vec3D.h" />
|
||||
<ClInclude Include="engine\Vec4D.h" />
|
||||
<ClInclude Include="engine\World.h" />
|
||||
<ClInclude Include="Player.h" />
|
||||
<ClInclude Include="PlayerController.h" />
|
||||
<ClInclude Include="Server.h" />
|
||||
<ClInclude Include="Shooter.h" />
|
||||
<ClInclude Include="ShooterClient.h" />
|
||||
<ClInclude Include="ShooterConsts.h" />
|
||||
<ClInclude Include="ShooterMsgType.h" />
|
||||
<ClInclude Include="ShooterServer.h" />
|
||||
<ClInclude Include="weapon\Ak47.h" />
|
||||
<ClInclude Include="weapon\Gold_Ak47.h" />
|
||||
<ClInclude Include="weapon\Gun.h" />
|
||||
|
|
|
|||
|
|
@ -13,288 +13,330 @@
|
|||
<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>
|
||||
<Filter Include="Исходные файлы\weapon">
|
||||
<UniqueIdentifier>{0882d5d0-3c6b-4bf1-b638-d29f836996c3}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Исходные файлы\engine">
|
||||
<UniqueIdentifier>{9b426b47-01cf-4bcc-a8a0-a99cd596d3f1}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Исходные файлы\engine\animation">
|
||||
<UniqueIdentifier>{a0867a68-434b-4f6e-a462-e10ae78f3457}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Исходные файлы\engine\utils">
|
||||
<UniqueIdentifier>{e376bcc3-fc30-45c5-977a-dac4e8805010}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Исходные файлы\engine\network">
|
||||
<UniqueIdentifier>{d83e2569-574f-494b-ae1e-cfb8da446856}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Исходные файлы\engine\physics">
|
||||
<UniqueIdentifier>{ccd70959-35a5-4270-8c85-ee409828e9f6}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Исходные файлы\engine\gui">
|
||||
<UniqueIdentifier>{10343b27-7f9f-4012-8b2e-5ce1218920bb}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Файлы заголовков\engine">
|
||||
<UniqueIdentifier>{3f063cbe-7c3d-4778-aec3-5f4686184f07}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Файлы заголовков\weapon">
|
||||
<UniqueIdentifier>{d42a1e65-36fc-4d95-aabd-84437c19fd8b}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Файлы заголовков\engine\gui">
|
||||
<UniqueIdentifier>{cf1bc24c-2974-4a9c-9572-009cd13d2050}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Файлы заголовков\engine\physics">
|
||||
<UniqueIdentifier>{740c71ba-cd6a-4c49-8b29-635c32f22d3c}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Файлы заголовков\engine\animation">
|
||||
<UniqueIdentifier>{9fc460cd-0c99-4366-9b43-adc8c1fa0a6d}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Файлы заголовков\engine\network">
|
||||
<UniqueIdentifier>{305a3198-17bc-4126-aeff-a600a39cb168}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Файлы заголовков\engine\utils">
|
||||
<UniqueIdentifier>{2ec2e90f-ff40-460e-b316-975089ed4eb1}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="Source.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Bonus.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Client.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Player.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="PlayerController.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Server.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Shooter.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Camera.cpp">
|
||||
<ClCompile Include="ShooterClient.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Engine.cpp">
|
||||
<ClCompile Include="ShooterServer.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Keyboard.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Mesh.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Mouse.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Object.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Plane.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\ResourceManager.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Screen.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Triangle.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\World.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\utils\Log.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\utils\Time.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\physics\RigidBody.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\ClientUDP.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\MsgType.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\ReliableMsg.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\ServerUDP.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\UDPConnection.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\UDPSocket.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\gui\Button.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\gui\Window.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\animation\Animation.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\animation\Timeline.cpp">
|
||||
<ClCompile Include="ShooterMsgType.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="weapon\Ak47.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
<Filter>Исходные файлы\weapon</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="weapon\Gun.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
<Filter>Исходные файлы\weapon</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="weapon\Rifle.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
<Filter>Исходные файлы\weapon</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="weapon\Shotgun.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
<Filter>Исходные файлы\weapon</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="weapon\Weapon.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
<Filter>Исходные файлы\weapon</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\animation\Animation.cpp">
|
||||
<Filter>Исходные файлы\engine\animation</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\animation\Timeline.cpp">
|
||||
<Filter>Исходные файлы\engine\animation</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\gui\Button.cpp">
|
||||
<Filter>Исходные файлы\engine\gui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Camera.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\ClientUDP.cpp">
|
||||
<Filter>Исходные файлы\engine\network</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Engine.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Keyboard.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\utils\Log.cpp">
|
||||
<Filter>Исходные файлы\engine\utils</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Matrix4x4.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Point4D.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
<ClCompile Include="engine\Mesh.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Mouse.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\MsgType.cpp">
|
||||
<Filter>Исходные файлы\engine\network</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Object.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Plane.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\ReliableMsg.cpp">
|
||||
<Filter>Исходные файлы\engine\network</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\ResourceManager.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\physics\RigidBody.cpp">
|
||||
<Filter>Исходные файлы\engine\physics</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Screen.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\ServerUDP.cpp">
|
||||
<Filter>Исходные файлы\engine\network</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\SoundController.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\utils\Time.cpp">
|
||||
<Filter>Исходные файлы\engine\utils</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Triangle.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\UDPConnection.cpp">
|
||||
<Filter>Исходные файлы\engine\network</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\network\UDPSocket.cpp">
|
||||
<Filter>Исходные файлы\engine\network</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Vec2D.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Vec3D.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\Vec4D.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\gui\Window.cpp">
|
||||
<Filter>Исходные файлы\engine\gui</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="engine\World.cpp">
|
||||
<Filter>Исходные файлы\engine</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="Bonus.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Client.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Player.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="PlayerController.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Server.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Shooter.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Camera.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Engine.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Keyboard.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Mesh.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Mouse.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Object.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Plane.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\ResourceManager.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Screen.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Triangle.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\World.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\utils\Log.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\utils\Time.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\physics\RigidBody.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\physics\Simplex.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\ClientUDP.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\MsgType.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\ReliableMsg.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\ServerUDP.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\UDPConnection.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\UDPSocket.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\gui\Button.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\gui\Window.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\AColor.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\AFunction.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\Animation.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\ARotate.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\AScale.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\ATranslate.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\ATranslateToPoint.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\AWait.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\Interpolation.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\Timeline.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Ak47.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Gold_Ak47.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Gun.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Rifle.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Shotgun.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Weapon.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ShooterConsts.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Consts.h">
|
||||
<ClInclude Include="ShooterClient.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ShooterServer.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ShooterMsgType.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\AColor.h">
|
||||
<Filter>Файлы заголовков\engine\animation</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\AFunction.h">
|
||||
<Filter>Файлы заголовков\engine\animation</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\Animation.h">
|
||||
<Filter>Файлы заголовков\engine\animation</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\ARotate.h">
|
||||
<Filter>Файлы заголовков\engine\animation</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\AScale.h">
|
||||
<Filter>Файлы заголовков\engine\animation</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\ATranslate.h">
|
||||
<Filter>Файлы заголовков\engine\animation</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\ATranslateToPoint.h">
|
||||
<Filter>Файлы заголовков\engine\animation</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\AWait.h">
|
||||
<Filter>Файлы заголовков\engine\animation</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Ak47.h">
|
||||
<Filter>Файлы заголовков\weapon</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Gold_Ak47.h">
|
||||
<Filter>Файлы заголовков\weapon</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Gun.h">
|
||||
<Filter>Файлы заголовков\weapon</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Rifle.h">
|
||||
<Filter>Файлы заголовков\weapon</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Shotgun.h">
|
||||
<Filter>Файлы заголовков\weapon</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\gui\Button.h">
|
||||
<Filter>Файлы заголовков\engine\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\gui\Window.h">
|
||||
<Filter>Файлы заголовков\engine\gui</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\Interpolation.h">
|
||||
<Filter>Файлы заголовков\engine\animation</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\ClientUDP.h">
|
||||
<Filter>Файлы заголовков\engine\network</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\MsgType.h">
|
||||
<Filter>Файлы заголовков\engine\network</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\ReliableMsg.h">
|
||||
<Filter>Файлы заголовков\engine\network</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\UDPConnection.h">
|
||||
<Filter>Файлы заголовков\engine\network</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\UDPSocket.h">
|
||||
<Filter>Файлы заголовков\engine\network</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\network\ServerUDP.h">
|
||||
<Filter>Файлы заголовков\engine\network</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="weapon\Weapon.h">
|
||||
<Filter>Файлы заголовков\weapon</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Camera.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Consts.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Engine.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Keyboard.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Matrix4x4.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Point4D.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
<ClInclude Include="engine\Mesh.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Object.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Mouse.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Plane.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\ResourceManager.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Screen.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\SoundController.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Triangle.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Vec2D.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Vec3D.h">
|
||||
<Filter>Файлы заголовков</Filter>
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\Vec4D.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\utils\Log.h">
|
||||
<Filter>Файлы заголовков\engine\utils</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\utils\Time.h">
|
||||
<Filter>Файлы заголовков\engine\utils</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\physics\Simplex.h">
|
||||
<Filter>Файлы заголовков\engine\physics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\physics\RigidBody.h">
|
||||
<Filter>Файлы заголовков\engine\physics</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\animation\Timeline.h">
|
||||
<Filter>Файлы заголовков\engine\animation</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="engine\World.h">
|
||||
<Filter>Файлы заголовков\engine</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup />
|
||||
</Project>
|
||||
Loading…
Reference in New Issue