memartel_loc/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'SQC-15_animation' into SQC19_Booster

Browse Source
This commit is contained in:
Frederic Leger 2023-11-20 12:15:28 -05:00
commit 225c815da4
122 changed files with 1365 additions and 552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SQCSim-common/bullet.cpp
View File

@ -7,11 +7,19 @@ Bullet::Bullet(Vector3f pos, Vector3f dir, uint64_t tid): m_startpos(pos), m_cur
Bullet::~Bullet() {}
bool Bullet::Update(World* world, float elapsedtime, int perframe) {
bool Bullet::Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> mapPlayer) {
int max = 100 / perframe;
float damage = 0.057f;
for (int x = 0; x < max; ++x) {
m_currentpos += m_velocity * elapsedtime;
for (auto& [key, player] : mapPlayer) {
if ((m_currentpos - player->GetPosition()).Length() < .4f) {
player->InflictDamage(damage);
return true;
}
}
if (!world->ChunkAt(m_currentpos))
return true;
else if (world->BlockAt(m_currentpos) != BTYPE_AIR) {
@ -20,6 +28,7 @@ bool Bullet::Update(World* world, float elapsedtime, int perframe) {
}
else if ((m_currentpos - m_startpos).Length() > VIEW_DISTANCE) return true;
}
return false;
}

8
SQCSim-common/bullet.h
View File

@ -1,10 +1,14 @@
#ifndef BULLET_H__
#define BULLET_H__
#include <unordered_map>
#include "define.h"
#include "vector3.h"
#include "player.h"
class World;
class Player;
class Bullet {
public:
@ -12,7 +16,7 @@ public:
Bullet(Vector3f pos, Vector3f dir, uint64_t tid);
~Bullet();
bool Update(World* world, float elapsedtime, int perframe);
bool Update(World* world, float elapsedtime, int perframe, std::unordered_map<uint64_t, Player*> m_mapPlayer);
void Transpose(int& x, int& z);
Vector3f getPos() const;
Vector3f getVel() const;
@ -23,6 +27,8 @@ private:
m_currentpos,
m_velocity;
uint64_t m_tid = 0;
};
#endif // BULLET_H__

3
SQCSim-common/define.h
View File

@ -7,7 +7,7 @@
#define SRV_PORT 10000
#define CLI_PORT 10001
#define BUFFER_LENGTH 150
#define BUFFER_LENGTH 1500
#define CHUNK_SIZE_X 4
#define CHUNK_SIZE_Y 64
@ -52,6 +52,7 @@ typedef uint64_t Timestamp;
#include <cstdio>
#include <ctime>
#define poll WSAPoll
#define flag_t u_long
#define addrlen_t int
#define ioctl ioctlsocket

397
SQCSim-common/netprotocol.cpp
View File

@ -88,7 +88,57 @@ void netprot::Serialize(Output* out, char* buf[], uint32_t* buflen) {
memcpy(*buf + sizeof(uint64_t) + 1, sid8, sizeof(uint64_t));
// TODO: Finir ca.
States states = out->states;
uint8_t states8 =
states.jumping & 0b10000000 |
states.shooting & 0b01000000 |
states.hit & 0b00100000 |
states.powerup & 0b00010000 |
states.dead & 0b00001000 |
states.still & 0b00000100 |
states.jumpshot & 0b00000010 |
states.running & 0b00000001;
memcpy(*buf + sizeof(uint64_t) * 2 + 1, &states8, sizeof(uint8_t));
uint32_t vec[3];
memcpy(vec, &out->direction, sizeof(Vector3f)); // Pour d<>naturer les floats.
uint8_t vec8[3 * sizeof(uint32_t)] = {
(uint8_t)((vec[0] >> 24) & 0xFF),
(uint8_t)((vec[0] >> 16) & 0xFF),
(uint8_t)((vec[0] >> 8) & 0xFF),
(uint8_t)(vec[0] & 0xFF),
(uint8_t)((vec[1] >> 24) & 0xFF),
(uint8_t)((vec[1] >> 16) & 0xFF),
(uint8_t)((vec[1] >> 8) & 0xFF),
(uint8_t)(vec[1] & 0xFF),
(uint8_t)((vec[2] >> 24) & 0xFF),
(uint8_t)((vec[2] >> 16) & 0xFF),
(uint8_t)((vec[2] >> 8) & 0xFF),
(uint8_t)(vec[2] & 0xFF) };
memcpy(*buf + sizeof(uint64_t) * 2 + 2, vec8, sizeof(uint32_t) * 3);
memcpy(vec, &out->position, sizeof(Vector3f)); // Pour d<>naturer les floats.
uint8_t vec82[3 * sizeof(uint32_t)] = {
(uint8_t)((vec[0] >> 24) & 0xFF),
(uint8_t)((vec[0] >> 16) & 0xFF),
(uint8_t)((vec[0] >> 8) & 0xFF),
(uint8_t)(vec[0] & 0xFF),
(uint8_t)((vec[1] >> 24) & 0xFF),
(uint8_t)((vec[1] >> 16) & 0xFF),
(uint8_t)((vec[1] >> 8) & 0xFF),
(uint8_t)(vec[1] & 0xFF),
(uint8_t)((vec[2] >> 24) & 0xFF),
(uint8_t)((vec[2] >> 16) & 0xFF),
(uint8_t)((vec[2] >> 8) & 0xFF),
(uint8_t)(vec[2] & 0xFF) };
memcpy(*buf + sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 3, vec82, sizeof(uint32_t) * 3);
*buflen = sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 6;
}
void netprot::Serialize(Sync* sync, char* buf[], uint32_t* buflen) {
@ -366,8 +416,8 @@ void netprot::Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen) {
bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) {
if (buflen <= sizeof(Input))
bool netprot::Deserialize(Input* in, char* buf, uint32_t *buflen) {
if (*buflen <= sizeof(Input))
return false;
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@ -421,15 +471,90 @@ bool netprot::Deserialize(Input* in, char* buf, const uint32_t buflen) {
memcpy(&in->direction, vec, sizeof(uint32_t) * 3);
*buflen = sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 3;
return true;
}
bool netprot::Deserialize(Output* out, char* buf, const uint32_t buflen) {
bool netprot::Deserialize(Output* out, char* buf, uint32_t *buflen) {
if (*buflen <= sizeof(Output))
return false;
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
memcpy(diff, &buf[1], sizeof(uint64_t));
out->timestamp =
(uint64_t)diff[0] << 56 |
(uint64_t)diff[1] << 48 |
(uint64_t)diff[2] << 40 |
(uint64_t)diff[3] << 32 |
(uint64_t)diff[4] << 24 |
(uint64_t)diff[5] << 16 |
(uint64_t)diff[6] << 8 |
(uint64_t)diff[7];
memcpy(diff, &buf[1 + sizeof(uint64_t)], sizeof(uint64_t));
out->id =
(uint64_t)diff[0] << 56 |
(uint64_t)diff[1] << 48 |
(uint64_t)diff[2] << 40 |
(uint64_t)diff[3] << 32 |
(uint64_t)diff[4] << 24 |
(uint64_t)diff[5] << 16 |
(uint64_t)diff[6] << 8 |
(uint64_t)diff[7];
uint8_t states = 0;
memcpy(&states, &buf[1 + sizeof(uint64_t) * 2], sizeof(uint8_t));
out->states.jumping = states & 0b10000000;
out->states.shooting = states & 0b01000000;
out->states.hit = states & 0b00100000;
out->states.dead = states & 0b00010000;
out->states.still = states & 0b00001000;
out->states.jumpshot = states & 0b00000100;
out->states.running = states & 0b00000010;
uint8_t subvec[3 * sizeof(uint32_t)] = { 0,0,0,0,0,0,0,0,0,0,0,0 };
memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2], sizeof(uint8_t) * 12);
uint32_t vec[3] = {
(uint32_t)subvec[0] << 24 |
(uint32_t)subvec[1] << 16 |
(uint32_t)subvec[2] << 8 |
(uint32_t)subvec[3],
(uint32_t)subvec[4] << 24 |
(uint32_t)subvec[5] << 16 |
(uint32_t)subvec[6] << 8 |
(uint32_t)subvec[7],
(uint32_t)subvec[8] << 24 |
(uint32_t)subvec[9] << 16 |
(uint32_t)subvec[10] << 8 |
(uint32_t)subvec[11] };
memcpy(&out->direction, vec, sizeof(uint32_t) * 3);
memcpy(subvec, &buf[2 + sizeof(uint64_t) * 2 + sizeof(uint32_t) * 3], sizeof(uint8_t) * 12);
uint32_t vec2[3] = {
(uint32_t)subvec[0] << 24 |
(uint32_t)subvec[1] << 16 |
(uint32_t)subvec[2] << 8 |
(uint32_t)subvec[3],
(uint32_t)subvec[4] << 24 |
(uint32_t)subvec[5] << 16 |
(uint32_t)subvec[6] << 8 |
(uint32_t)subvec[7],
(uint32_t)subvec[8] << 24 |
(uint32_t)subvec[9] << 16 |
(uint32_t)subvec[10] << 8 |
(uint32_t)subvec[11] };
memcpy(&out->position, vec2, sizeof(uint32_t) * 3);
*buflen = sizeof(uint64_t) * 2 + 2 + sizeof(uint32_t) * 6;
return true;
}
bool netprot::Deserialize(Sync* sync, char* buf, const uint32_t buflen) {
if (buflen <= sizeof(Sync))
bool netprot::Deserialize(Sync* sync, char* buf, uint32_t *buflen) {
if (*buflen <= sizeof(Sync))
return false;
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@ -487,11 +612,13 @@ bool netprot::Deserialize(Sync* sync, char* buf, const uint32_t buflen) {
memcpy(&sync->position, vec, sizeof(uint32_t) * 3);
*buflen = sizeof(uint64_t) * 2 + sizeof(uint32_t) * 4 + sizeof(uint16_t) + 2;
return true;
}
bool netprot::Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen) {
if (buflen <= sizeof(LoginInfo))
bool netprot::Deserialize(TeamInfo* tinfo, char* buf, uint32_t *buflen) {
if (*buflen <= sizeof(LoginInfo))
return false;
size_t namesize = std::strlen(buf) + 1;
@ -513,11 +640,13 @@ bool netprot::Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen) {
(uint64_t)diff[6] << 8 |
(uint64_t)diff[7];
*buflen = namesize + sizeof(uint64_t) + 2;
return true;
}
bool netprot::Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen) {
if (buflen <= sizeof(LoginInfo))
bool netprot::Deserialize(LoginInfo* linfo, char* buf, uint32_t *buflen) {
if (*buflen <= sizeof(LoginInfo))
return false;
size_t namesize = std::strlen(buf) + 1;
@ -550,11 +679,13 @@ bool netprot::Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen) {
(uint64_t)diff[6] << 8 |
(uint64_t)diff[7];
*buflen = namesize + sizeof(uint64_t) * 2 + 2;
return true;
}
bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen) {
if (buflen <= sizeof(PlayerInfo))
bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, uint32_t *buflen) {
if (*buflen <= sizeof(PlayerInfo))
return false;
size_t namesize = std::strlen(buf) + 1;
@ -587,11 +718,13 @@ bool netprot::Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen) {
(uint64_t)diff[6] << 8 |
(uint64_t)diff[7];
*buflen = namesize + sizeof(uint64_t) * 2 + 2;
return true;
}
bool netprot::Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen) {
if (buflen <= sizeof(GameInfo))
bool netprot::Deserialize(GameInfo* ginfo, char* buf, uint32_t *buflen) {
if (*buflen <= sizeof(GameInfo))
return false;
uint8_t diff[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@ -628,11 +761,13 @@ bool netprot::Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen) {
(uint64_t)diff[6] << 8 |
(uint64_t)diff[7];
*buflen = sizeof(uint64_t) * 3 + 1;
return true;
}
bool netprot::Deserialize(Chat* chat, char* buf, const uint32_t buflen) {
if (buflen <= sizeof(Chat))
bool netprot::Deserialize(Chat* chat, char* buf, uint32_t *buflen) {
if (*buflen <= sizeof(Chat))
return false;
uint8_t src[sizeof(uint64_t)] = { 0,0,0,0,0,0,0,0 };
@ -677,11 +812,14 @@ bool netprot::Deserialize(Chat* chat, char* buf, const uint32_t buflen) {
return false;
memcpy(&chat->mess, &buf[1 + sizeof(uint64_t) * 3], messsize);
*buflen = messsize + sizeof(uint64_t) * 3 + 2;
return true;
}
bool netprot::Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen) {
if (buflen <= sizeof(ErrorLog))
bool netprot::Deserialize(ErrorLog* errlog, char* buf, uint32_t *buflen) {
if (*buflen <= sizeof(ErrorLog))
return false;
size_t messsize = std::strlen(buf) + 1;
@ -692,9 +830,13 @@ bool netprot::Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen) {
memcpy(&errlog->mess, &buf[1], messsize);
memcpy(&errlog->is_fatal, &buf[1 + messsize], sizeof(bool));
*buflen = messsize + sizeof(uint64_t) * 3 + 2;
return true;
}
netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
if (buflen < 1 ||
buf[0] >= (char)netprot::PACKET_TYPE::LAST_PACK ||
@ -703,7 +845,7 @@ netprot::PACKET_TYPE netprot::getType(char* buf, const uint32_t buflen) {
return (netprot::PACKET_TYPE)buf[0];
}
netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
netprot::Packet netprot::getPack(char* buf, uint32_t *buflen) {
Packet pck = { nullptr, PACKET_TYPE::ERR };
Input* in = nullptr;
Output* out = nullptr;
@ -713,7 +855,7 @@ netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
ErrorLog* errlog = nullptr;
LoginInfo* loginf = nullptr;
switch (getType(buf, buflen)) {
switch (getType(buf, *buflen)) {
case PACKET_TYPE::INPUT:
in = new Input();
if (netprot::Deserialize(in, buf, buflen)) {
@ -770,7 +912,7 @@ netprot::Packet netprot::getPack(char* buf, uint32_t buflen) {
}
netprot::Packet netprot::getPack(netprot::Buffer* buf) {
return netprot::getPack(buf->ptr, buf->len);
return netprot::getPack(buf->ptr, &buf->len);
}
bool netprot::emptyPack(netprot::Packet pck) {
@ -808,80 +950,197 @@ netprot::Packet netprot::makePack(void* ptr, PACKET_TYPE type) {
return pck;
}
std::vector<netprot::Packet> netprot::recvPacks(SOCKET sock, Buffer* buf) {
std::vector<Packet> lsPck;
int len = 0, end = 0;
bool pck_received = false;
char* cursor = nullptr;
std::vector<char*> netprot::recvPacks(SOCKET sock, Buffer* buf, Buffer* outbuf) {
std::vector<char*> lsPck;
int len = buf->tmp? buf->tmp - buf->ptr: 0,
end = 0;
char * cursor = buf->tmp ? buf->tmp: nullptr ,
* next = buf->tmp ? buf->tmp + 1: buf->ptr,
* last = buf->tmp ? buf->tmp: buf->ptr;
bool ended = true;
struct pollfd fds[1];
fds[0].fd = sock;
fds[0].events = POLLIN;
while (true) {
while (!pck_received) {
int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0);
if (bytes < 0) // si recv() retourne -1; ça veut dire qu'il y a plus rien a lire.
if (!poll(fds, 1, 0)) {
if (ended)
buf->tmp = nullptr;
return lsPck;
}
int bytes = recv(sock, &buf->ptr[len], buf->len - len, 0);
if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
if (ended)
buf->tmp = nullptr;
return lsPck;
}
len += bytes;
// TODO: Voir si on trouve un footer (5 '\0' d'affilee).
// Si oui, mettre l'index du debut du footer dans
// la variable "end" et mettre pck_received a true.
end = len;
ended = false;
while (true) {
int cmp = 0;
if (cursor)
end -= (cursor - buf->ptr);
if (end < 0)
break;
cursor = (char*)memchr(next, '\r', end);
if (cursor) {
next = cursor;
cursor--;
cmp = memcmp(cursor, Footer, sizeof(uint32_t));
if (cmp == 0) {
if (!outbuf) {
lsPck.push_back(last);
cursor += sizeof(uint32_t);
last = cursor;
next = cursor + 1;
}
else {
memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
lsPck.push_back(&outbuf->ptr[cursor - last]);
cursor += sizeof(uint32_t);
last = cursor;
next = cursor + 1;
}
}
}
else {
if (!outbuf)
buf->tmp = last;
cursor = &buf->ptr[len];
next = cursor + 1;
break;
};
}
}
}
cursor = &buf->ptr[end];
std::vector<char*> netprot::recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* outbuf) {
std::vector<char*> lsPck;
int len = buf->tmp ? buf->tmp - buf->ptr : 0,
end = 0;
char* cursor = buf->tmp ? buf->tmp : nullptr,
* next = buf->tmp ? buf->tmp + 1 : buf->ptr,
* last = buf->tmp ? buf->tmp : buf->ptr;
bool ended = true;
struct pollfd fds[1];
sockaddr_in sockad = from;
addrlen_t socklen = sizeof(sockad);
lsPck.push_back(getPack(buf));
fds[0].fd = sock;
fds[0].events = POLLIN;
while (*cursor == '\0') {
cursor++;
end++;
while (true) {
if (!poll(fds, 1, 0)) {
if (ended)
buf->tmp = nullptr;
return lsPck;
}
if (cursor) { // mettre le début du prochain paquet au début du buffer.
memcpy(buf->ptr, cursor, buf->len - end); // et voir s'il y a en un autre
len = 0;
pck_received = true;
int bytes = recvfrom(sock, &buf->ptr[len], buf->len - len, 0, (sockaddr*)&sockad, &socklen);
if (bytes <= 0) { // si recv() retourne -1 ou 0; ça veut dire qu'il y a plus rien a lire qui n'a pas déjà été traité.
if (ended)
buf->tmp = nullptr;
return lsPck;
}
len += bytes;
end = len;
ended = false;
while (true) {
int cmp = 0;
if (cursor)
end -= (cursor - buf->ptr);
if (end < 0)
break;
cursor = (char*)memchr(next, '\r', end);
if (cursor) {
next = cursor;
cursor--;
cmp = memcmp(cursor, Footer, sizeof(uint32_t));
if (cmp == 0) {
if (!outbuf) {
lsPck.push_back(last);
cursor += sizeof(uint32_t);
last = cursor;
next = cursor + 1;
}
else {
memcpy(&outbuf->ptr[cursor - last], last, cursor - last);
lsPck.push_back(&outbuf->ptr[cursor - last]);
cursor += sizeof(uint32_t);
last = cursor;
next = cursor + 1;
}
}
}
else {
if (!outbuf)
buf->tmp = last;
cursor = &buf->ptr[len];
next = cursor + 1;
break;
};
}
}
}
template <>
void netprot::sendPack<netprot::Packet>(SOCKET sock, Packet* pack, char** buf, uint32_t* buflen) {
void netprot::sendPack<netprot::Packet>(SOCKET sock, Packet* pack, Buffer* buf) {
switch (pack->type) {
case PACKET_TYPE::INPUT:
sendPack<Input>(sock, (Input*)pack->ptr, buf, buflen);
sendPack<Input>(sock, (Input*)pack->ptr, buf);
return;
case PACKET_TYPE::OUTPUT:
sendPack<Output>(sock, (Output*)pack->ptr, buf, buflen);
sendPack<Output>(sock, (Output*)pack->ptr, buf);
return;
case PACKET_TYPE::SYNC:
sendPack<Sync>(sock, (Sync*)pack->ptr, buf, buflen);
sendPack<Sync>(sock, (Sync*)pack->ptr, buf);
return;
case PACKET_TYPE::TEAMINF:
sendPack<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf, buflen);
sendPack<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf);
return;
case PACKET_TYPE::PLAYINF:
sendPack<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf, buflen);
sendPack<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf);
return;
case PACKET_TYPE::LOGINF:
sendPack<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf, buflen);
sendPack<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf);
return;
case PACKET_TYPE::CHUNKMOD:
//sendPack<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf, buflen);
//sendPack<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf);
return;
case PACKET_TYPE::PLAYERMOD:
//sendPack<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf, buflen);
//sendPack<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf);
return;
case PACKET_TYPE::PICKUPMOD:
//sendPack<PickupMod>(sock, (PickupMod*)pack->ptr, buf, buflen);
//sendPack<PickupMod>(sock, (PickupMod*)pack->ptr, buf);
return;
case PACKET_TYPE::GAMEINFO:
sendPack<GameInfo>(sock, (GameInfo*)pack->ptr, buf, buflen);
sendPack<GameInfo>(sock, (GameInfo*)pack->ptr, buf);
return;
case PACKET_TYPE::ENDINFO:
//sendPack<EndInfo>(sock, (EndInfo*)pack->ptr, buf, buflen);
//sendPack<EndInfo>(sock, (EndInfo*)pack->ptr, buf);
return;
case PACKET_TYPE::CHAT:
sendPack<Chat>(sock, (Chat*)pack->ptr, buf, buflen);
sendPack<Chat>(sock, (Chat*)pack->ptr, buf);
return;
case PACKET_TYPE::ERRLOG:
sendPack<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf, buflen);
sendPack<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf);
return;
case PACKET_TYPE::LAST_PACK: [[fallthrough]];
case PACKET_TYPE::ERR: [[fallthrough]];
@ -891,46 +1150,46 @@ void netprot::sendPack<netprot::Packet>(SOCKET sock, Packet* pack, char** buf, u
}
template <>
void netprot::sendPackTo<netprot::Packet>(SOCKET sock, Packet* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad) {
void netprot::sendPackTo<netprot::Packet>(SOCKET sock, Packet* pack, Buffer* buf, sockaddr_in* sockad) {
switch (pack->type) {
case PACKET_TYPE::INPUT:
sendPackTo<Input>(sock, (Input*)pack->ptr, buf, buflen, sockad);
sendPackTo<Input>(sock, (Input*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::OUTPUT:
sendPackTo<Output>(sock, (Output*)pack->ptr, buf, buflen, sockad);
sendPackTo<Output>(sock, (Output*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::SYNC:
sendPackTo<Sync>(sock, (Sync*)pack->ptr, buf, buflen, sockad);
sendPackTo<Sync>(sock, (Sync*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::TEAMINF:
sendPackTo<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf, buflen, sockad);
sendPackTo<TeamInfo>(sock, (TeamInfo*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::PLAYINF:
sendPackTo<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf, buflen, sockad);
sendPackTo<PlayerInfo>(sock, (PlayerInfo*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::LOGINF:
sendPackTo<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf, buflen, sockad);
sendPackTo<LoginInfo>(sock, (LoginInfo*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::CHUNKMOD:
//sendPackTo<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf, buflen, sockad);
//sendPackTo<ChunkMod>(sock, (ChunkMod*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::PLAYERMOD:
//sendPackTo<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf, buflen, sockad);
//sendPackTo<PlayerMod>(sock, (PlayerMod*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::PICKUPMOD:
//sendPackTo<PickupMod>(sock, (PickupMod*)pack->ptr, buf, buflen, sockad);
//sendPackTo<PickupMod>(sock, (PickupMod*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::GAMEINFO:
sendPackTo<GameInfo>(sock, (GameInfo*)pack->ptr, buf, buflen, sockad);
sendPackTo<GameInfo>(sock, (GameInfo*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::ENDINFO:
//sendPackTo<EndInfo>(sock, (EndInfo*)pack->ptr, buf, buflen, sockad);
//sendPackTo<EndInfo>(sock, (EndInfo*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::CHAT:
sendPackTo<Chat>(sock, (Chat*)pack->ptr, buf, buflen, sockad);
sendPackTo<Chat>(sock, (Chat*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::ERRLOG:
sendPackTo<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf, buflen, sockad);
sendPackTo<ErrorLog>(sock, (ErrorLog*)pack->ptr, buf, sockad);
return;
case PACKET_TYPE::LAST_PACK: [[fallthrough]];
case PACKET_TYPE::ERR: [[fallthrough]];

75
SQCSim-common/netprotocol.h
View File

@ -7,8 +7,6 @@
/* Protocole Particulier de Partie a Plusieurs Personnes (PPPPP) */
// Packet: packet[0] = PacketType, packet[1..n-1] = {packet}
namespace netprot {
enum class PACKET_TYPE: uint8_t {
ERR, INPUT, OUTPUT, SYNC,
@ -18,8 +16,10 @@ namespace netprot {
LAST_PACK
};
/* Structures */
struct Buffer { // Pour pouvoir rendre l'utilisation des buffers plus clean.
char* ptr = new char[BUFFER_LENGTH];
char* ptr = new char[BUFFER_LENGTH] { 1 }, * tmp = nullptr;
uint32_t len = BUFFER_LENGTH;
~Buffer() { delete[] ptr; }
@ -31,6 +31,12 @@ namespace netprot {
PACKET_TYPE type = PACKET_TYPE::ERR;
};
/* Constantes */
inline const char Footer[sizeof(uint32_t)] = { '\0', '\r', '\0', '\n' }; // constante de footer qui est ajoutée à chaque paquet envoyé.
/* Sous-structures */
struct Keys {
bool forward,
backward,
@ -52,6 +58,8 @@ namespace netprot {
running;
};
/* Structures de paquets */
struct Input { // cli -> srv UDP ~frame
Timestamp timestamp;
uint64_t sid = 0;
@ -67,7 +75,7 @@ namespace netprot {
States states; // 0bJSH_____ bit-packing de bool.
};
struct Sync { // srv -> cli TCP ~second
struct Sync { // srv -> cli TCP ~second - un premier sync démarre la partie.
Timestamp timestamp;
uint64_t sid = 0;
uint32_t timer = 0;
@ -98,7 +106,11 @@ namespace netprot {
uint64_t id = 0,
tid = 0;
PlayerInfo() {}
PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) { strcpy(log->name, name); }
PlayerInfo(PlayerInfo* log) : id(log->id), tid(log->tid) {
strcpy(log->name, name);
};
PlayerInfo(int id, int tid, std::string strname) : id(id), tid(tid) { memcpy((void*)strname.c_str(), name, strname.length());
}
};
struct GameInfo { // cli <-> srv TCP event (before game start)/ once
@ -125,6 +137,8 @@ namespace netprot {
ErrorLog(ErrorLog* err) : is_fatal(err->is_fatal) { strcpy(err->mess, mess); }
};
/* Fonctions */
void Serialize(Input* in, char* buf[], uint32_t* buflen); // cli
void Serialize(Output* out, char* buf[], uint32_t* buflen); // srv
void Serialize(Sync* sync, char* buf[], uint32_t* buflen); // srv
@ -135,48 +149,56 @@ namespace netprot {
void Serialize(Chat* chat, char* buf[], uint32_t* buflen); // cli/srv
void Serialize(ErrorLog* errlog, char* buf[], uint32_t* buflen); // srv
bool Deserialize(Input* in, char* buf, const uint32_t buflen); // srv
bool Deserialize(Output* out, char* buf, const uint32_t buflen); // cli
bool Deserialize(Sync* sync, char* buf, const uint32_t buflen); // cli
bool Deserialize(TeamInfo* tinfo, char* buf, const uint32_t buflen); // cli/srv
bool Deserialize(LoginInfo* linfo, char* buf, const uint32_t buflen); // cli/srv
bool Deserialize(PlayerInfo* pinfo, char* buf, const uint32_t buflen); // cli
bool Deserialize(GameInfo* ginfo, char* buf, const uint32_t buflen); // cli
bool Deserialize(Chat* chat, char* buf, const uint32_t buflen); // srv/cli
bool Deserialize(ErrorLog* errlog, char* buf, const uint32_t buflen); // srv
bool Deserialize(Input* in, char* buf, uint32_t* buflen); // srv
bool Deserialize(Output* out, char* buf, uint32_t* buflen); // cli
bool Deserialize(Sync* sync, char* buf, uint32_t* buflen); // cli
bool Deserialize(TeamInfo* tinfo, char* buf, uint32_t* buflen); // cli/srv
bool Deserialize(LoginInfo* linfo, char* buf, uint32_t* buflen); // cli/srv
bool Deserialize(PlayerInfo* pinfo, char* buf, uint32_t* buflen); // cli
bool Deserialize(GameInfo* ginfo, char* buf, uint32_t* buflen); // cli
bool Deserialize(Chat* chat, char* buf, uint32_t* buflen); // srv/cli
bool Deserialize(ErrorLog* errlog, char* buf, uint32_t* buflen); // srv
PACKET_TYPE getType(char* buf, uint32_t buflen);
Packet getPack(char* buf, uint32_t buflen);
Packet getPack(char* buf, uint32_t *buflen);
Packet getPack(Buffer* buf);
bool emptyPack(Packet pck);
Packet makePack(void* ptr, PACKET_TYPE type); // Pour pouvoir faire une liste de stock a supprimer sans avoir a en faire une pour chaque type.
template <class T> T copyPack(Packet* pck);
template <class T> void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen);
template <class T> void sendPackTo(SOCKET sock, T* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad);
template <class T> void sendPack(SOCKET sock, T* pack, Buffer* buf);
template <class T> void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad);
std::vector<Packet> recvPacks(SOCKET sock, Buffer* buf);
std::vector<char*> recvPacks(SOCKET sock, Buffer* buf, Buffer* oufbuf = nullptr);
std::vector<char*> recvPacksFrom(SOCKET sock, Buffer* buf, sockaddr_in from, Buffer* oufbuf = nullptr);
/* Templates */
template <class T>
T copyPack(Packet* pck) { return T((T*)pck->ptr); }
template <class T>
void sendPack(SOCKET sock, T* pack, char** buf, uint32_t* buflen) {
netprot::Serialize(pack, buf, buflen);
memset(&buf[*buflen], '\0', sizeof(uint64_t) + sizeof(uint8_t));
buflen += (sizeof(uint64_t) + sizeof(uint8_t));
memcpy(*buf + *buflen, Footer, sizeof(uint32_t));
*buflen += sizeof(Footer);
send(sock, *buf, *buflen, 0);
*buflen = BUFFER_LENGTH;
}
template <class T>
void sendPackTo(SOCKET sock, T* pack, char** buf, uint32_t* buflen, sockaddr_in* sockad) {
sockaddr_in addr = *sockad;
const sockaddr_in addr = *sockad;
netprot::Serialize(pack, buf, buflen);
memset(&buf[*buflen], '\0', sizeof(uint64_t) + sizeof(uint8_t));
buflen += (sizeof(uint64_t) + sizeof(uint8_t));
memcpy(*buf + *buflen, Footer, sizeof(uint32_t));
*buflen += sizeof(Footer);
sendto(sock, *buf, *buflen, 0, (sockaddr*)&addr, sizeof(addr));
*buflen = BUFFER_LENGTH;
}
@ -184,22 +206,21 @@ namespace netprot {
template <class T>
void sendPack(SOCKET sock, T* pack, Buffer* buf) {
netprot::Serialize(pack, &buf->ptr, &buf->len);
memset(&buf->ptr[buf->len], '\0', sizeof(uint64_t) + sizeof(uint8_t));
buf->len += sizeof(uint64_t) + sizeof(uint8_t);
memcpy(&buf->ptr[buf->len], Footer, sizeof(uint32_t));
buf->len += sizeof(Footer);
send(sock, buf->ptr, buf->len, 0);
buf->rstLen();
}
template <class T>
void sendPackTo(SOCKET sock, T* pack, Buffer* buf, sockaddr_in* sockad) {
sockaddr_in addr = *sockad;
const sockaddr_in addr = *sockad;
netprot::Serialize(pack, &buf->ptr, &buf->len);
memset(&buf->ptr[buf->len], '\0', sizeof(uint64_t) + sizeof(uint8_t));
buf->len += sizeof(uint64_t) + sizeof(uint8_t);
memcpy(&buf->ptr[buf->len], Footer, sizeof(uint32_t));
buf->len += sizeof(Footer);
sendto(sock, buf->ptr, buf->len, 0, (sockaddr*)&addr, sizeof(addr));
buf->rstLen();
}
};
#endif

31
SQCSim-common/player.cpp
View File

@ -4,7 +4,7 @@
Player::Player(const Vector3f& position, float rotX, float rotY) : m_position(position), m_rotX(rotX), m_rotY(rotY) {
m_velocity = Vector3f(0, 0, 0);
m_airborne = true;
m_hp = 0.75f; //TODO: Remettre à 1.0f
m_hp = 1.0f; //TODO: Remettre <20> 1.0f
m_username = "Zelda Bee-Bop56";
}
@ -172,7 +172,7 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
m_position += m_velocity;
static float bobbingtime = 0; // Gestion de la caméra
static float bobbingtime = 0; // Gestion de la cam<EFBFBD>ra
static bool leftright = false;
static bool isStep = false;
if (bobbingtime <= 360.f)
@ -191,10 +191,14 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
return snd;
}
void Player::ApplyTransformation(Transformation& transformation, bool rel) const {
void Player::ApplyTransformation(Transformation& transformation, bool rel, bool rot) const {
transformation.ApplyRotation(-m_rotX, 1, 0, 0);
transformation.ApplyRotation(-m_rotY, 0, 1, 0);
if (rel) transformation.ApplyTranslation(-GetPOV());
if (!rot) {
transformation.ApplyRotation(-m_rotX, 1, 0, 0);
transformation.ApplyRotation(-m_rotY, 0, 1, 0);
}
}
void Player::GetBooster(Booster boosttype)
@ -240,6 +244,7 @@ void Player::RemoveBooster(float elapsedtime)
boostinvincible = false;
}
}
void Player::SetDirection(Vector3f dir) { m_direction = dir; }
Vector3f Player::GetPosition() const { return Vector3f(m_position.x + CHUNK_SIZE_X * WORLD_SIZE_X / 2, m_position.y, m_position.z + CHUNK_SIZE_Z * WORLD_SIZE_Y / 2); }
@ -257,6 +262,26 @@ void Player::Teleport(int& x, int& z) {
m_position.x -= x * CHUNK_SIZE_X;
m_position.z -= z * CHUNK_SIZE_Z;
}
bool Player::AmIDead()
{
return m_hp <= 0;
}
void Player::InflictDamage(float hitPoints)
{
m_hp -= hitPoints;
if (AmIDead())
{ // Quand le joueur est mort.
}
}
uint64_t Player::getId() const { return id; }

11
SQCSim-common/player.h
View File

@ -5,6 +5,7 @@
#include "transformation.h"
#include "vector3.h"
class World;
class Player {
@ -19,9 +20,11 @@ public:
void TurnTopBottom(float value);
Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime);
Sound ApplyPhysics(Vector3f input, World* world, float elapsedTime);
void ApplyTransformation(Transformation& transformation, bool rel = true) const;
void GetBooster(Booster boosttype);
void RemoveBooster(float elapsedtime);
void ApplyTransformation(Transformation& transformation, bool rel = true, bool rot = true) const;
void SetDirection(Vector3f dir);
Vector3f GetPosition() const;
Vector3f GetDirection() const;
Vector3f GetVelocity() const;
@ -30,6 +33,10 @@ public:
float GetHP() const;
void Teleport(int& x, int& z);
bool AmIDead();
void InflictDamage(float hitPoints);
private:
uint64_t getId() const;
protected:
@ -54,6 +61,8 @@ protected:
bool boostdamage;
bool boostinvincible;
Vector3f InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now);
};
#endif //_PLAYER_H__

29
SQCSim-common/world.cpp
View File

@ -16,6 +16,9 @@ void World::SetSeed(uint64_t seed) {
m_seed = seed;
}
Chunk* World::ChunkAt(float x, float y, float z) const {
int cx = (int)x / CHUNK_SIZE_X;
int cz = (int)z / CHUNK_SIZE_Z;
@ -31,6 +34,32 @@ Chunk* World::ChunkAt(float x, float y, float z) const {
Chunk* World::ChunkAt(const Vector3f& pos) const { return ChunkAt(pos.x, pos.y, pos.z); }
void World::RemoveChunk(int nbReduit)
{
for (int x = 0; x < WORLD_SIZE_X; ++x)
for (int y = 0; y < WORLD_SIZE_Y; ++y)
{
Chunk* chk = nullptr;
if (x < nbReduit)
chk = m_chunks.Remove(x, y);
if (y < nbReduit)
chk = m_chunks.Remove(x, y);
if (y > WORLD_SIZE_Y - nbReduit)
chk = m_chunks.Remove(x, y);
if (x > WORLD_SIZE_X - nbReduit)
chk = m_chunks.Remove(x, y);
// TODO: MakeDirty() les voisins pour qu'ils se redessinent.
if (!chk)
continue;
m_tbDeleted.emplace_back(chk);
}
}
BlockType World::BlockAt(float x, float y, float z, BlockType defaultBlockType) const {
Chunk* c = ChunkAt(x, y, z);

2
SQCSim-common/world.h
View File

@ -28,6 +28,8 @@ public:
Chunk* ChunkAt(float x, float y, float z) const;
Chunk* ChunkAt(const Vector3f& pos) const;
void RemoveChunk(int nbReduit);
BlockType BlockAt(float x, float y, float z, BlockType defaultBlockType = BTYPE_AIR) const;
BlockType BlockAt(const Vector3f& pos, BlockType defaultBlockType = BTYPE_AIR) const;

64
SQCSim-srv/connection.cpp
View File

@ -47,6 +47,70 @@ PlayerInfo* Connection::getInfo() const { return (PlayerInfo*)&m_playinfo; }
sockaddr_in* Connection::getAddr() const { return (sockaddr_in*)&m_addr; }
void Connection::getPacks(SOCKET sock) {
std::vector<char*> lsPck;
Input in;
while (true) {
lsPck = recvPacksFrom(sock, &m_buf, m_addr);
for (auto& pck : lsPck) {
uint32_t bsize = m_buf.len - (pck - m_buf.ptr);
switch (netprot::getType(pck, 1)) {
using enum netprot::PACKET_TYPE;
case INPUT:
if (Deserialize(&in, pck, &bsize))
m_input_manifest[in.timestamp] = in;
break;
default: break;
}
}
lsPck.clear();
}
}
void Connection::sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns) {
while (m_last_out < m_output_manifest.size()) {
Output out = m_output_manifest.at(m_last_out++);
for (auto& [key, conn] : conns) {
if (m_playinfo.id == conn->GetHash(true))
continue;
sendPackTo<Output>(sock, &out, &m_bufout, conn->getAddr());
}
}
}
void Connection::Run(World* world) {
Input in, last;
Output out;
float el;
if (m_input_manifest.size() < 2)
return;
while (m_last_in < m_input_manifest.size()) {
in = m_input_manifest.at(m_last_in + 1);
last = m_input_manifest.at(m_last_in);
el = (float)(in.timestamp - last.timestamp) / 1000.;
player.get()->SetDirection(in.direction);
player.get()->ApplyPhysics(player.get()->GetInput(in.keys.forward,
in.keys.backward,
in.keys.left,
in.keys.right,
in.keys.jump, false, el), world, el);
out.position = player.get()->GetPosition();
out.direction = in.direction;
out.timestamp = in.timestamp;
out.id = m_playinfo.id;
m_output_manifest[out.timestamp] = out;
++m_last_in;
}
}
void Connection::CleanInputManifest(Timestamp time) {
auto wat = m_input_manifest.find(time);

20
SQCSim-srv/connection.h
View File

@ -2,10 +2,11 @@
#define CONNECTION_H__
#include <deque>
#include <map>
#include <unordered_map>
#include "../SQCSim-common/player.h"
#include "../SQCSim-common/vector3.h"
#include "../SQCSim-common/netprotocol.h"
#include "../SQCSim-common/world.h"
#include "define.h"
using namespace netprot;
@ -32,16 +33,27 @@ public:
PlayerInfo* getInfo() const;
sockaddr_in* getAddr() const;
void getPacks(SOCKET sock);
void sendPacks(SOCKET sock, std::unordered_map<uint64_t, Connection*> conns);
void Run(World* world);
void CleanInputManifest(Timestamp time);
private:
std::map<Timestamp, Input> m_input_manifest;
std::map<Timestamp, Output> m_output_manifest;
std::map<Timestamp, Chat> m_chatlog;
std::unordered_map<Timestamp, Input> m_input_manifest;
std::unordered_map<Timestamp, Output> m_output_manifest;
std::unordered_map<Timestamp, Chat> m_chatlog;
SOCKET m_sock;
sockaddr_in m_addr;
LoginInfo m_loginfo;
PlayerInfo m_playinfo;
Timestamp m_startsync;
uint64_t m_last_in = 0,
m_last_out = 0;
Buffer m_buf,
m_bufout;
};
#endif

71
SQCSim-srv/server.cpp
View File

@ -129,6 +129,7 @@ int Server::Ready() {
if (recv(sock, m_buf.ptr, m_buf.len, 0) > 0) {
PlayerInfo play;
m_buf.len = BUFFER_LENGTH;
Packet pck = getPack(&m_buf);
if (pck.type != PACKET_TYPE::LOGINF) {
Log("Paquet invalide.", true, false);
@ -139,22 +140,22 @@ int Server::Ready() {
LoginInfo* log = (LoginInfo*)pck.ptr;
log->sid = getUniqueId();
log->tid = 0; // TODO: À changer si on implemente un mode en equipe.
log->tid = 1145389380; // TODO: À changer si on implemente un mode en equipe.
Log(str.append(" Nom: ").append(log->name), false, false);
str.clear();
Log(str.append(log->name).append(" SID: [").append(std::to_string(log->sid).append("]")), false, false);
sendPack<LoginInfo>(sock, log, &m_buf.ptr, &m_buf.len);
sendPack<LoginInfo>(sock, log, &m_buf);
play.id = getUniqueId();
strcpy(play.name, log->name);
play.tid = log->tid;
sendPack<GameInfo>(sock, &m_game, &m_buf.ptr, &m_buf.len);
std::unique_ptr<Connection> conn = std::make_unique<Connection>(sock, sockad, *log, play);
sendPack<GameInfo>(sock, &m_game, &m_buf);
Connection* conn = new Connection(sock, sockad, *log, play);
for (auto& [key, player] : m_players) {
sendPack<PlayerInfo>(player->getSock(), &play, &m_buf); // Envoyer les infos de joueur distant aux joueurs d<>j<EFBFBD> connect<63>s
@ -174,13 +175,16 @@ int Server::Ready() {
}
void Server::Run() {
bool endgame = false;
Input in;
sockaddr_in sockad;
addrlen_t socklen = sizeof(sockad);
Log("Debut de la partie...", false, false);
m_world = std::make_unique<World>();
int players = m_players.size();
m_world = new World();
m_world->SetSeed(m_game.seed);
m_world->GetChunks().Reset(nullptr);
m_world->BuildWorld();
@ -197,32 +201,41 @@ void Server::Run() {
sendPack<Sync>(conn->getSock(), &sync, &m_buf);
}
while (true) {
if (recvfrom(m_sock_udp, m_buf.ptr, m_buf.len, 0, (sockaddr*)&sockad, &socklen) > 0) {
Packet pck = getPack(&m_buf);
switch (pck.type) {
using enum netprot::PACKET_TYPE;
case ERR: std::puts("ERROR!"); break;
case INPUT: std::puts("INPUT!"); break;
case OUTPUT: std::puts("OUTPUT!"); break;
case SYNC: std::puts("SYNC!"); break;
case TEAMINF: std::puts("TEAMINF!"); break;
case SELFINF: std::puts("SELFINF!"); break;
case PLAYINF: std::puts("PLAYINF!"); break;
case LOGINF: std::puts("LOGINF!"); break;
case CHUNKMOD: std::puts("CHUNKMOD!"); break;
case PLAYERMOD: std::puts("PLAYERMOD!"); break;
case PICKUPMOD: std::puts("PICKUPMOD!"); break;
case GAMEINFO: std::puts("GAMEINFO!"); break;
case ENDINFO: std::puts("ENDINFO!"); break;
case CHAT: std::puts("CHAT!"); break;
case ERRLOG: std::puts("ERRLOG!"); break;
case LAST_PACK: [[falltrough]];
default: std::puts("wtf?!"); break;
}
netprot::emptyPack(pck);
while (!endgame) {
for (auto& [key, conn] : m_players) {
conn->getPacks(m_sock_udp);
conn->Run(m_world);
conn->sendPacks(m_sock_udp, m_players);
}
}
//while (true) {
// if (recvfrom(m_sock_udp, m_buf.ptr, m_buf.len, 0, (sockaddr*)&sockad, &socklen) > 0) {
// Packet pck = getPack(&m_buf);
// switch (pck.type) {
// using enum netprot::PACKET_TYPE;
// case ERR: std::puts("ERROR!"); break;
// case INPUT: std::puts("INPUT!"); break;
// case OUTPUT: std::puts("OUTPUT!"); break;
// case SYNC: std::puts("SYNC!"); break;
// case TEAMINF: std::puts("TEAMINF!"); break;
// case SELFINF: std::puts("SELFINF!"); break;
// case PLAYINF: std::puts("PLAYINF!"); break;
// case LOGINF: std::puts("LOGINF!"); break;
// case CHUNKMOD: std::puts("CHUNKMOD!"); break;
// case PLAYERMOD: std::puts("PLAYERMOD!"); break;
// case PICKUPMOD: std::puts("PICKUPMOD!"); break;
// case GAMEINFO: std::puts("GAMEINFO!"); break;
// case ENDINFO: std::puts("ENDINFO!"); break;
// case CHAT: std::puts("CHAT!"); break;
// case ERRLOG: std::puts("ERRLOG!"); break;
// case LAST_PACK: [[falltrough]];
// default: std::puts("wtf?!"); break;
// }
// netprot::emptyPack(pck);
// }
//}
}
inline std::string Server::LogTimestamp() {

7
SQCSim-srv/server.h
View File

@ -5,6 +5,7 @@
#include <vector>
#include <set>
#include <string>
#include <unordered_map>
#include "../SQCSim-common/world.h"
#include "../SQCSim-common/netprotocol.h"
#include "define.h"
@ -35,12 +36,12 @@ private:
Buffer m_buf;
std::map<uint64_t, std::unique_ptr<Connection>> m_players;
std::map <Timestamp, Chat> m_chatlog;
std::unordered_map<uint64_t, Connection*> m_players;
std::unordered_map<Timestamp, Chat> m_chatlog;
std::vector<uint64_t> m_ids;
GameInfo m_game;
std::unique_ptr<World> m_world = nullptr;
World* m_world = nullptr;
const bool m_manual_setup = SRV_MANUAL_SETUP;
std::string LogTimestamp();

4
SQCSim2021/SQCSim2021.vcxproj
View File

@ -170,7 +170,7 @@
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
@ -192,7 +192,7 @@
<FloatingPointModel>Fast</FloatingPointModel>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>

31
SQCSim2021/connector.cpp
View File

@ -69,44 +69,51 @@ int Connector::Connect(const char* srv_addr, std::string name) {
netprot::sendPack(m_sock_tcp, &log, &bf);
//using namespace std::chrono_literals;
//std::this_thread::sleep_for(100ms);
memset(bf.ptr, '\0', BUFFER_LENGTH);
bool ready = false;
int errors = 0;
std::vector<netprot::Packet> lsPck;
std::vector<char*> lsPck;
while (!ready) {
lsPck = netprot::recvPacks(m_sock_tcp, &bf);
for (auto& pck : lsPck) {
bool bypass_delete = false;
uint32_t bsize = bf.len - (pck - bf.ptr);
netprot::PlayerInfo* pl = nullptr;
switch (pck.type) {
switch (netprot::getType(pck, 1)) {
using enum netprot::PACKET_TYPE;
case LOGINF:
m_loginfo = netprot::LoginInfo((netprot::LoginInfo*)pck.ptr);
if (!netprot::Deserialize(&m_loginfo, pck, &bsize))
++errors;
break;
case GAMEINFO:
m_gameinfo = netprot::GameInfo((netprot::GameInfo*)pck.ptr);
if (!netprot::Deserialize(&m_gameinfo, pck, &bsize))
++errors;
break;
case PLAYINF:
pl = (netprot::PlayerInfo*)pck.ptr;
m_players[pl->id] = pl;
bypass_delete = true;
pl = new netprot::PlayerInfo();
if (!netprot::Deserialize(pl, pck, &bsize))
++errors;
else m_players[pl->id] = pl;
break;
case TEAMINF:
// TODO: Faire dequoi avec TeamInfo si on fini par avoir des teams.
break;
case SYNC:
m_origin = netprot::Sync((netprot::Sync*)pck.ptr);
if (!netprot::Deserialize(&m_origin, pck, &bsize))
++errors;
ready = true;
break;
default:
errors++;
break;
}
if (!bypass_delete)
netprot::emptyPack(pck);
}
lsPck.clear();
if (errors > 100)
if (errors > 1000)
return 4;
}
return 0;

7
SQCSim2021/connector.h
View File

@ -2,6 +2,7 @@
#define CONNECTOR_H__
#include <stdlib.h>
#include <unordered_map>
#include "../SQCSim-common/netprotocol.h"
#include "define.h"
@ -26,13 +27,13 @@ public:
// void updateRemotePlayers(std::map<RemotePlayers> rplayers);
std::map<uint64_t, netprot::PlayerInfo> m_players;
std::unordered_map<uint64_t, netprot::PlayerInfo> m_players;
private:
#ifdef _WIN32
WSADATA m_wsaData;
#endif
std::map<Timestamp, netprot::Input> m_inputmanifest;
std::map<uint64_t, netprot::TeamInfo> m_teams;
std::unordered_map<Timestamp, netprot::Input> m_inputmanifest;
std::unordered_map<uint64_t, netprot::TeamInfo> m_teams;
netprot::LoginInfo m_loginfo;
netprot::GameInfo m_gameinfo;

502
SQCSim2021/engine.cpp
View File

@ -11,12 +11,13 @@ struct Notification {
float displayStartTime = 0.0f;
};
// Use a queue to manage notifications
//std::queue<Notification> notificationQueue;
// Use a vector to manage notifications
std::vector<Notification> notifications;
Engine::Engine() {}
Engine::Engine() : m_remotePlayer(&m_pinfo), m_pinfo(){}
Engine::~Engine() {
m_world.CleanUpWorld(m_renderCount, true);
@ -72,6 +73,8 @@ void Engine::DrawSplachScreen()
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
m_gamestate = GameState::OPTIONS;
}
@ -99,11 +102,11 @@ void Engine::DrawMenu()
glTexCoord2f(0, 0);
glVertex2i(0, 0);
glTexCoord2f(1, 0);
glVertex2i(800, 0);
glVertex2i(Width(), 0); //
glTexCoord2f(1, 1);
glVertex2i(800, 600);
glVertex2i(Width(), Height());
glTexCoord2f(0, 1);
glVertex2i(0, 600);
glVertex2i(0, Height());
glEnd();
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@ -125,6 +128,8 @@ void Engine::DrawMenu()
glVertex2i(0, 300);
glEnd();
MenuStartTexture.Bind();
glTranslated(80, -225, 0);
glBegin(GL_QUADS);
@ -138,12 +143,13 @@ void Engine::DrawMenu()
glVertex2i(0, 200);
glEnd();
/*MenuResumeTexture.Bind();
glTranslated(0, -100, 0);
glBegin(GL_QUADS);
glTexCoord2f(0, 0);
glVertex2i(0, 125);
glTexCoord2f(1, 0);
//glTexCoord2f(1, 0);
glVertex2i(sButton, 125);
glTexCoord2f(1, 1);
glVertex2i(sButton, 200);
@ -270,8 +276,46 @@ void Engine::DrawMenu()
ShowCursor();
}
void Engine::Init() {
void Engine::DrawPause()
{
static const int sTitle = 400;
static const int sButton = 225;
glDisable(GL_LIGHTING);
glDisable(GL_DEPTH_TEST);
glDisable(GL_STENCIL_TEST);
glMatrixMode(GL_PROJECTION);
glPushMatrix();
glLoadIdentity();
glOrtho(0, Width(), 0, Height(), -1, 1);
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
PauseBGTexture.Bind();
glLoadIdentity();
glBegin(GL_QUADS);
glTexCoord2f(0, 0);
glVertex2i(0, 0);
glTexCoord2f(1, 0);
glVertex2i(800, 0);
glTexCoord2f(1, 1);
glVertex2i(800, 600);
glTexCoord2f(0, 1);
glVertex2i(0, 600);
glEnd();
glDisable(GL_BLEND);
glEnable(GL_DEPTH_TEST);
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
ShowCursor();
}
void Engine::Init() {
GLenum glewErr = glewInit();
if (glewErr != GLEW_OK) {
@ -280,14 +324,13 @@ void Engine::Init() {
}
uint64_t seed = SEED;
char ch;
glDisable(GL_FRAMEBUFFER_SRGB);
glEnable(GL_DEPTH_TEST);
glEnable(GL_STENCIL_TEST);
glEnable(GL_POINT_SMOOTH);
glEnable(GL_BLEND);
glEnable(GL_CULL_FACE);
//glEnable(GL_CULL_FACE);
glEnable(GL_TEXTURE_2D);
glMatrixMode(GL_PROJECTION);
@ -301,10 +344,14 @@ void Engine::Init() {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendEquation(GL_FUNC_SUBTRACT);
if (m_istarted)
return;
else m_istarted = true;
//
// Objet de skybox avec sa propre texture et son propre shader!
m_skybox.Init(0.2f);
//m_skybox2.Init(1.f);
// Objet de musique!
//m_audio.ToggleMusicState();
@ -314,17 +361,18 @@ void Engine::Init() {
m_whoosh[x] = nullptr;
}
char* ch = new char[2];
std::cout << "Jouer en ligne? [o/N] ";
std::cin >> ch;
std::cin.getline(ch, 2);
std::cout << std::endl;
if (ch == 'o' || ch == 'O') {
if (*ch == 'o' || *ch == 'O') {
char* input = new char[32];
std::string playname, srvname;
while (playname.size() < 1) {
std::cout << "Veuillez entrer un nom de joueur: ";
std::cin.ignore();
std::cin.getline(input, 32);
std::cout << std::endl;
playname = input;
@ -358,12 +406,16 @@ void Engine::Init() {
}
else std::cout << "Erreur de creation de socket." << std::endl;
}
delete[] ch;
m_world.SetSeed(seed);
// Init Chunks
m_world.GetChunks().Reset(nullptr);
m_startTime = std::chrono::high_resolution_clock::now();
m_remotePlayer.SetPosition(Vector3f(.5,CHUNK_SIZE_Y + 10., .5));
// Gestion de souris.
CenterMouse();
HideCursor();
@ -373,19 +425,25 @@ void Engine::DeInit() {}
void Engine::LoadResource() {
LoadTexture(m_skybox.GetTexture(), TEXTURE_PATH "skybox.png", true);
//LoadTexture(m_skybox2.GetTexture(), TEXTURE_PATH "skybox.png", true);
LoadTexture(m_textureCrosshair, TEXTURE_PATH "cross.bmp", true);
LoadTexture(m_textureFont, TEXTURE_PATH "font.bmp", true);
LoadTexture(m_textureGun, TEXTURE_PATH "gun01.png", false);
LoadTexture(m_texturePovGun, TEXTURE_PATH "GUN.png", false);
LoadTexture(m_textureSoloMultiMenu, TEXTURE_PATH "single_multi.png", false);
LoadTexture(m_textureSoloText, TEXTURE_PATH "single_player.png", false);
LoadTexture(m_textureMultiText, TEXTURE_PATH "multi_player.png", false);
LoadTexture(m_textureSoloMultiMenu, TEXTURE_PATH "single_multi.png", false);
LoadTexture(m_textureTitle, TEXTURE_PATH "title.png", false);
LoadTexture(MenuTitleTexture, MENU_ITEM_PATH "test.png");
LoadTexture(MenuBGTexture, MENU_ITEM_PATH "test.png");
LoadTexture(MenuTitleTexture, TEXTURE_PATH "BrouillonbackgroundMenu.png");
LoadTexture(MenuBGTexture, TEXTURE_PATH "BrouillonbackgroundMenu.png");
LoadTexture(PauseBGTexture, TEXTURE_PATH "BrouillonbackgroundMenu.png");
LoadTexture(SplachScreenTexture, TEXTURE_PATH "sc2.png");
LoadTexture(MenuQuitTexture, MENU_ITEM_PATH "BasicQuit.png");
LoadTexture(MenuOptionsTexture, MENU_ITEM_PATH "test.png");
LoadTexture(MenuStartTexture, MENU_ITEM_PATH "BasicPlay.png");
TextureAtlas::TextureIndex texDirtIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "metal3.png");
TextureAtlas::TextureIndex texIceIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "metal2.png");
TextureAtlas::TextureIndex texGrassIndex = m_textureAtlas.AddTexture(TEXTURE_PATH "grass.png");
@ -433,6 +491,12 @@ void Engine::LoadResource() {
void Engine::UnloadResource() {}
void Engine::InstantDamage()
{
m_player.InflictDamage(0.10f);
m_damage = false;
}
void Engine::SystemNotification(std::string systemLog) {
std::string message = "";
@ -468,16 +532,13 @@ void Engine::ProcessNotificationQueue() {
//float fPosY = Height() - (Height() * 0.05) * scaleY;
m_textureFont.Bind();
auto [scaleX, scaleY] = GetScale();
float xOffset = (Width() / 1.5f) * scaleX;
float yOffset = (Height() / 1.2f) * scaleY;
float xOffset = Width() * 0.66f;
float yOffset = Height() * 0.83f;
for (auto it = notifications.begin(); it != notifications.end(); ) {
float timeSinceDisplay = m_time - it->displayStartTime;
float y = yOffset - (20.0f * scaleX * (it - notifications.begin()));
float y = yOffset - (20.0f * (it - notifications.begin()));
glDisable(GL_STENCIL_TEST);
glDisable(GL_DEPTH_TEST);
@ -550,14 +611,13 @@ void Engine::DisplayPovGun() {
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
float scaleX = (Width()) / BASE_WIDTH;
float scaleY = (Height()) / BASE_HEIGHT;
float baseXOffset = 0.4958 * BASE_WIDTH;
float baseWidth = 0.4688 * BASE_WIDTH;
float baseHeight = 0.5787 * BASE_HEIGHT;
float xTranslation = baseXOffset * scaleX;
float quadWidth = baseWidth * scaleX;
float quadHeight = baseHeight * scaleY;
float baseXOffsetPercentage = 0.4958;
float baseWidthPercentage = 0.4688;
float baseHeightPercentage = 0.5787;
float xTranslation = baseXOffsetPercentage * Width();
float quadWidth = baseWidthPercentage * Width();
float quadHeight = baseHeightPercentage * Height();
m_texturePovGun.Bind();
glLoadIdentity();
@ -582,7 +642,6 @@ void Engine::DisplayPovGun() {
glMatrixMode(GL_PROJECTION);
glPopMatrix();
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
}
@ -595,37 +654,44 @@ void Engine::DisplayHud(int timer) {
glBindTexture(GL_TEXTURE_2D, 0);
glLoadIdentity();
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
auto [scaleX, scaleY] = GetScale();
float fBackPosX = (Width() / 25.0f) * scaleX;
float fBackPosY = (Height() - (Height() * 0.815) * scaleY);
float fBackWidth = (Width() / 4.0f) * scaleX;
float fBackHeight = (Height() / 5.5f) * scaleY;
float itemBackgroundWidthProportion = 0.25f;
float itemBackgroundHeightProportion = 0.175f;
float itemBackgroundWidth = Width() * itemBackgroundWidthProportion;
float itemBackgroundHeight = Height() * itemBackgroundHeightProportion;
float itemBackgroundXOffset = Width() * 0.05f;
float itemBackgroundYOffset = Height() * 0.6f;
float itemBackgroundXPos = itemBackgroundXOffset;
float itemBackgroundYPos = Height() - itemBackgroundHeight - itemBackgroundYOffset;
// Selected item background
glColor4f(1.0f, 1.0f, 1.0f, 0.2f);
glBegin(GL_QUADS);
glVertex2f(fBackPosX, fBackPosY);
glVertex2f(fBackPosX + fBackWidth, fBackPosY);
glVertex2f(fBackPosX + fBackWidth, fBackPosY + fBackHeight);
glVertex2f(fBackPosX, fBackPosY + fBackHeight);
glVertex2f(itemBackgroundXPos, itemBackgroundYPos);
glVertex2f(itemBackgroundXPos + itemBackgroundWidth, itemBackgroundYPos);
glVertex2f(itemBackgroundXPos + itemBackgroundWidth, itemBackgroundYPos + itemBackgroundHeight);
glVertex2f(itemBackgroundXPos, itemBackgroundYPos + itemBackgroundHeight);
glEnd();
// HP Bar
float fBarWidth = (Width() / 4.0f) * scaleX;
float fBarHeight = (Height() / 25.0f) * scaleY;
float fPosX = (Width() / 25.0f) * scaleX;
float fBarPosY = (Height() - (Height() * 0.775) * scaleY);
float playerHp = m_player.GetHP();
float facteurOmbrage = m_displayInfo ? 0.5f : 1.0f;
float hpBarWidthProportion = 0.25f;
float hpBarHeightProportion = 0.045f;
float hpBarWidth = Width() * hpBarWidthProportion;
float hpBarHeight = Height() * hpBarHeightProportion;
float hpBarXOffset = Width() * 0.05f;
float hpBarYOffset = Height() * 0.7f;
float hpBarYPos = Height() - hpBarHeight - hpBarYOffset;
// HP Bar Background
glColor3f(1.0f * facteurOmbrage, 1.0f * facteurOmbrage, 1.0f * facteurOmbrage);
glBegin(GL_QUADS);
glVertex2f(fPosX, fBarPosY - fBarHeight);
glVertex2f(fPosX + fBarWidth, fBarPosY - fBarHeight);
glVertex2f(fPosX + fBarWidth, fBarPosY);
glVertex2f(fPosX, fBarPosY);
glVertex2f(itemBackgroundXPos, hpBarYPos - hpBarHeight);
glVertex2f(itemBackgroundXPos + itemBackgroundWidth, hpBarYPos - hpBarHeight);
glVertex2f(itemBackgroundXPos + itemBackgroundWidth, hpBarYPos);
glVertex2f(itemBackgroundXPos, hpBarYPos);
glEnd();
//TODO: Associer avec mechanique de vie du joueur
@ -633,10 +699,10 @@ void Engine::DisplayHud(int timer) {
// Barre HP
glColor3f(0.0f * facteurOmbrage, 1.0f * facteurOmbrage, 0.0f * facteurOmbrage);
glBegin(GL_QUADS);
glVertex2f(fPosX, fBarPosY - fBarHeight);
glVertex2f(fPosX + fBarWidth * playerHp, fBarPosY - fBarHeight);
glVertex2f(fPosX + fBarWidth * playerHp, fBarPosY);
glVertex2f(fPosX, fBarPosY);
glVertex2f(itemBackgroundXPos, hpBarYPos - hpBarHeight);
glVertex2f(itemBackgroundXPos + itemBackgroundWidth * playerHp, hpBarYPos - hpBarHeight);
glVertex2f(itemBackgroundXPos + itemBackgroundWidth * playerHp, hpBarYPos);
glVertex2f(itemBackgroundXPos, hpBarYPos);
glEnd();
// Equip Bar
@ -644,22 +710,23 @@ void Engine::DisplayHud(int timer) {
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glColor3f(1.0f * facteurOmbrage, 1.0f * facteurOmbrage, 1.0f * facteurOmbrage);
float fEquipWidth = (Width() * 0.175f) * scaleX;
float fEquipHeight = (fEquipWidth / 2.5) * scaleY;
float fEquipPosY = (Height() - (Height() * 0.765) * scaleY);
float equipWidthProportion = 0.8f;
float equipHeightProportion = 0.7f;
float equipWidth = itemBackgroundWidth * equipWidthProportion;
float equipHeight = itemBackgroundHeight * equipHeightProportion;
float equipXOffset = itemBackgroundXPos + (itemBackgroundWidth - equipWidth) * 0.1f;
float equipYOffset = itemBackgroundYPos + (itemBackgroundHeight - equipHeight) * 0.75f;
glTranslatef(fPosX, fEquipPosY, 0);
glTranslatef(equipXOffset, equipYOffset, 0);
m_textureGun.Bind();
glBegin(GL_QUADS);
glTexCoord2f(0, 0); glVertex2i(0, 0);
glTexCoord2f(1, 0); glVertex2i(fEquipWidth, 0);
glTexCoord2f(1, 1); glVertex2i(fEquipWidth, fEquipHeight);
glTexCoord2f(0, 1); glVertex2i(0, fEquipHeight);
glTexCoord2f(0, 0); glVertex2f(0, 0);
glTexCoord2f(1, 0); glVertex2f(equipWidth, 0);
glTexCoord2f(1, 1); glVertex2f(equipWidth, equipHeight);
glTexCoord2f(0, 1); glVertex2f(0, equipHeight);
glEnd();
//glDisable(GL_BLEND);
// Username
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
@ -667,30 +734,37 @@ void Engine::DisplayHud(int timer) {
m_textureFont.Bind();
std::ostringstream ss;
float fUsernamePosY = fBarPosY - (fBarHeight * 2) * scaleY;
float fUsernamePosY = hpBarYPos - (hpBarHeight * 2);
ss.str("");
ss << m_player.GetUsername();
PrintText(fPosX, fUsernamePosY, ss.str(), 1.5f);
PrintText(itemBackgroundXPos, fUsernamePosY, ss.str(), 1.5f);
ss.str("");
ss << m_player.GetHP() * 100 << "%";
PrintText(fPosX * 6.25, fUsernamePosY, ss.str(), 1.5f);
PrintText(itemBackgroundXPos * 5.25f, fUsernamePosY, ss.str(), 1.5f);
float countdownXOffset = Width() * 0.2f;
float countdownYOffset = Height() * 0.1f;
float countdownXPos = Width() - countdownXOffset;
float countdownYPos = Height() - countdownYOffset;
// Countdown
ss.str("");
ss << "Time: " << (int)(timer / 60) << ":" << std::setw(2) << std::setfill('0') << timer % 60;
PrintText(Width() - (Width() * 0.2f) * scaleX, Height() - (Height() * 0.1) * scaleY, ss.str(), 2.0f);
PrintText(countdownXPos, countdownYPos, ss.str(), 2.0f);
}
void Engine::DisplayInfo(float elapsedTime, BlockType bloc) {
m_textureFont.Bind();
std::ostringstream ss;
auto [scaleX, scaleY] = GetScale();
float marginX = Width() * 0.01;
float marginY = Height() * 0.05;
float fPosX = marginX;
float fPosY = Height() - marginY;
float fPosX = (Width() / 100.0f) * scaleX;
float fPosY = Height() - (Height() * 0.05) * scaleY;
float charSize = 20 + (24 - 20) * (Width() - 1600) / (1920 - 1600);
ss << " Fps : " << GetFps(elapsedTime);
@ -708,21 +782,21 @@ void Engine::DisplayInfo(float elapsedTime, BlockType bloc) {
ss.str("");
fPosY -= charSize;
float fPosYJump = ((Height() - (Height() * 0.9f)) * scaleY);
float fPosYJump = Height() * 0.09;
fPosY = fPosYJump;
fPosY -= charSize;
ss << " Velocity : " << m_player.GetVelocity();
ss << " Velocity : " << m_remotePlayer.GetVelocity();
PrintText(fPosX, fPosY, ss.str());
ss.str("");
fPosY -= charSize;
ss << " Direction : " << m_player.GetDirection();
ss << " Player Position : " << m_player.GetPosition();
PrintText(fPosX, fPosY, ss.str());
ss.str("");
fPosY -= charSize;
ss << " Position : " << m_player.GetPosition();
ss << " Remote Position : " << m_remotePlayer.GetPosition();//m_player.GetPosition();
PrintText(fPosX, fPosY, ss.str());
ss.str("");
fPosY -= charSize;
@ -736,6 +810,9 @@ void Engine::DisplayInfo(float elapsedTime, BlockType bloc) {
}
void Engine::DisplaySingleOrMultiplayerMenu() {
GLint viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendEquation(GL_FUNC_ADD);
@ -752,64 +829,93 @@ void Engine::DisplaySingleOrMultiplayerMenu() {
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
auto [scaleX, scaleY] = GetScale();
float fBackPosX = 0.0f;
float fBackPosY = 0.0f;
float fBackWidth = Width();
float fBackHeight = Height();
// Background
m_textureSoloMultiMenu.Bind();
glBegin(GL_QUADS);
glTexCoord2f(0.0f, 0.0f); glVertex2f(fBackPosX, fBackPosY);
glTexCoord2f(1.0f, 0.0f); glVertex2f(fBackWidth, fBackPosY);
glTexCoord2f(1.0f, 1.0f); glVertex2f(fBackWidth, fBackHeight);
glTexCoord2f(0.0f, 1.0f); glVertex2f(fBackPosX, fBackHeight);
glTexCoord2f(0.0f, 0.0f); glVertex2f(0.0f, 0.0f);
glTexCoord2f(1.0f, 0.0f); glVertex2f(Width(), 0.0f);
glTexCoord2f(1.0f, 1.0f); glVertex2f(Width(), Height());
glTexCoord2f(0.0f, 1.0f); glVertex2f(0.0f, Height());
glEnd();
float centerX = (Width() / 2.0f);
float centerY = (Height() / 2.0f);
float titleWidth = (centerX * 1.85f) * scaleX;
float titleHeight = (centerY * 1.85f) * scaleY;
// Title
float titleWidthProportion = 0.4f;
float titleHeightProportion = 0.4f;
float titleWidth = titleWidthProportion * Width();
float titleHeight = titleHeightProportion * Height();
float offsetTitleXFactor = 0.05f;
float offsetTitleYFactor = 0.05f;
m_titleX = (Width() - titleWidth) - (offsetTitleXFactor * Width());
m_titleY = (Height() - titleHeight) - (offsetTitleYFactor * Height());
// Solo game indicator
m_textureTitle.Bind();
glColor4f(1.0f, 0.5f, 0.0f, 1.0f);
glBegin(GL_QUADS);
glTexCoord2f(0.0f, 0.0f); glVertex2f(centerX, centerY);
glTexCoord2f(1.0f, 0.0f); glVertex2f(titleWidth, centerY);
glTexCoord2f(1.0f, 1.0f); glVertex2f(titleWidth, titleHeight);
glTexCoord2f(0.0f, 1.0f); glVertex2f(centerX, titleHeight);
glTexCoord2f(0.0f, 0.0f); glVertex2f(m_titleX, m_titleY);
glTexCoord2f(1.0f, 0.0f); glVertex2f(m_titleX + titleWidth, m_titleY);
glTexCoord2f(1.0f, 1.0f); glVertex2f(m_titleX + titleWidth, m_titleY + titleHeight);
glTexCoord2f(0.0f, 1.0f); glVertex2f(m_titleX, m_titleY + titleHeight);
glEnd();
glBindTexture(GL_TEXTURE_2D, 0);
// Solo game indicator
float fPosX = (centerX * 1.1f) * scaleX;
float fPosXWidth = (centerX * 1.75f) * scaleX;
float soloPosY = (centerY * 0.75f) * scaleY;
float soloHeight = (centerY * 0.9f) * scaleY;
// Single Player and Multiplayer button background quads
float buttonWidthProportion = 0.4f;
float buttonHeightProportion = 0.075f;
float buttonWidth = buttonWidthProportion * Width();
float buttonHeight = buttonHeightProportion * Height();
float offsetSingleButtonXFactor = 0.075f;
float offsetSingleButtonYFactor = 0.05f;
float buttonPosX = m_titleX;
float buttonSinglePosY = m_titleY - buttonHeight - (offsetSingleButtonYFactor * Height());
float buttonMultiPosY = (buttonSinglePosY * 0.75);
// Single Player background
glColor4f(1.0f, 1.0f, 1.0f, 0.5f);
glBegin(GL_QUADS);
glTexCoord2f(0.0f, 0.0f); glVertex2f(fPosX, soloPosY);
glTexCoord2f(1.0f, 0.0f); glVertex2f(fPosXWidth, soloPosY);
glTexCoord2f(1.0f, 1.0f); glVertex2f(fPosXWidth, soloHeight);
glTexCoord2f(0.0f, 1.0f); glVertex2f(fPosX, soloHeight);
glTexCoord2f(0.0f, 0.0f); glVertex2f(buttonPosX, buttonSinglePosY);
glTexCoord2f(1.0f, 0.0f); glVertex2f(buttonPosX + buttonWidth, buttonSinglePosY);
glTexCoord2f(1.0f, 1.0f); glVertex2f(buttonPosX + buttonWidth, buttonSinglePosY + buttonHeight);
glTexCoord2f(0.0f, 1.0f); glVertex2f(buttonPosX, buttonSinglePosY + buttonHeight);
glEnd();
// Multiplayer game indicator
float multiPosY = (centerY * 0.5f) * scaleY;
float multiHeight = (centerY * 0.65f) * scaleY;
// Single Player text
m_textureSoloText.Bind();
glColor4f(0.75f, 0.05f, 0.0f, 1.0f);
glBegin(GL_QUADS);
glTexCoord2f(0.0f, 0.0f); glVertex2f(fPosX, multiPosY);
glTexCoord2f(1.0f, 0.0f); glVertex2f(fPosXWidth, multiPosY);
glTexCoord2f(1.0f, 1.0f); glVertex2f(fPosXWidth, multiHeight);
glTexCoord2f(0.0f, 1.0f); glVertex2f(fPosX, multiHeight);
glTexCoord2f(0.0f, 0.0f); glVertex2f(buttonPosX, buttonSinglePosY);
glTexCoord2f(1.0f, 0.0f); glVertex2f(buttonPosX + buttonWidth, buttonSinglePosY);
glTexCoord2f(1.0f, 1.0f); glVertex2f(buttonPosX + buttonWidth, buttonSinglePosY + buttonHeight);
glTexCoord2f(0.0f, 1.0f); glVertex2f(buttonPosX, buttonSinglePosY + buttonHeight);
glEnd();
glBindTexture(GL_TEXTURE_2D, 0);
// Multi Player background
glColor4f(1.0f, 1.0f, 1.0f, 0.5f);
glBegin(GL_QUADS);
glTexCoord2f(0.0f, 0.0f); glVertex2f(buttonPosX, buttonMultiPosY);
glTexCoord2f(1.0f, 0.0f); glVertex2f(buttonPosX + buttonWidth, buttonMultiPosY);
glTexCoord2f(1.0f, 1.0f); glVertex2f(buttonPosX + buttonWidth, buttonMultiPosY + buttonHeight);
glTexCoord2f(0.0f, 1.0f); glVertex2f(buttonPosX, buttonMultiPosY + buttonHeight);
glEnd();
// Multi Player text
m_textureMultiText.Bind();
glColor4f(0.75f, 0.05f, 0.0f, 1.0f);
glBegin(GL_QUADS);
glTexCoord2f(0.0f, 0.0f); glVertex2f(buttonPosX, buttonMultiPosY);
glTexCoord2f(1.0f, 0.0f); glVertex2f(buttonPosX + buttonWidth, buttonMultiPosY);
glTexCoord2f(1.0f, 1.0f); glVertex2f(buttonPosX + buttonWidth, buttonMultiPosY + buttonHeight);
glTexCoord2f(0.0f, 1.0f); glVertex2f(buttonPosX, buttonMultiPosY + buttonHeight);
glEnd();
// TODO: Add SOLO / MULTIPLAYER text with font
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
// Reset the state
glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
glEnable(GL_STENCIL_TEST);
glEnable(GL_DEPTH_TEST);
@ -818,6 +924,8 @@ void Engine::DisplaySingleOrMultiplayerMenu() {
glMatrixMode(GL_MODELVIEW);
glPopMatrix();
ShowCursor();
}
void Engine::DrawHud(float elapsedTime, BlockType bloc) {
@ -839,7 +947,13 @@ void Engine::DrawHud(float elapsedTime, BlockType bloc) {
glPushMatrix();
int timer = GetCountdown(elapsedTime);
for (int i = 1; i < WORLD_SIZE_X; i++)
{
if (timer <= COUNTDOWN - m_timerReductionChunk * i) {
m_world.RemoveChunk(m_nbReductionChunk * i);
m_renderer.RemoveChunk(m_nbReductionChunk * i);
}
}
if (m_keyK) {
SystemNotification(m_messageNotification);
m_keyK = false;
@ -876,10 +990,13 @@ void Engine::DrawHud(float elapsedTime, BlockType bloc) {
}
void Engine::PrintText(float x, float y, const std::string& t, float charSizeMultiplier) {
auto [scaleX, scaleY] = GetScale();
float scale = std::min(scaleX, scaleY);
float windowWidth = static_cast<float>(Width());
float windowHeight = static_cast<float>(Height());
float baseCharSize = 20 + (24 - 20) * (Width() - 1600) / (1920 - 1600);
float posX = x * windowWidth;
float posY = y * windowHeight;
float baseCharSize = 20 + (24 - 20) * (windowWidth - 1600) / (1920 - 1600);
float charSize = baseCharSize * charSizeMultiplier;
glLoadIdentity();
@ -892,26 +1009,22 @@ void Engine::PrintText(float x, float y, const std::string& t, float charSizeMul
glBegin(GL_QUADS);
glTexCoord2f(left, 1.f - top - .0625f); glVertex2f(0, 0);
glTexCoord2f(left + .0625f, 1.f - top - .0625f); glVertex2f(charSize * scale, 0);
glTexCoord2f(left + .0625f, 1.f - top); glVertex2f(charSize * scale, charSize * scale);
glTexCoord2f(left, 1.f - top); glVertex2f(0, charSize * scale);
glTexCoord2f(left + .0625f, 1.f - top - .0625f); glVertex2f(charSize, 0);
glTexCoord2f(left + .0625f, 1.f - top); glVertex2f(charSize, charSize);
glTexCoord2f(left, 1.f - top); glVertex2f(0, charSize);
glEnd();
glTranslated(0.5555f * charSize * scale, 0, 0);
glTranslated(0.5555f * charSize, 0, 0);
}
}
std::pair<float, float> Engine::GetScale() const {
float widthRatio = static_cast<float>(Width()) / BASE_WIDTH;
float heightRatio = static_cast<float>(Height()) / BASE_HEIGHT;
return { widthRatio, heightRatio };
}
int Engine::GetFps(float elapsedTime) const { return 1 / elapsedTime; }
int Engine::GetCountdown(float elapsedTime) {
if (m_resetcountdown)
{
m_nbReductionChunk = 4;
m_timerReductionChunk = 30;
m_countdown = m_time + COUNTDOWN;
m_resetcountdown = false;
}
@ -926,8 +1039,9 @@ void Engine::Render(float elapsedTime) {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
m_time_SplashScreen += elapsedTime;
if(m_time_SplashScreen < 2)
if (m_time_SplashScreen < 2) {
DrawSplachScreen();
}
else if (m_gamestate == GameState::PLAY)
{
HideCursor();
@ -946,6 +1060,8 @@ void Engine::Render(float elapsedTime) {
Transformation all;
Transformation skybox;
Transformation remotePlayer;
Vector3f vstep;
// Transformations initiales
@ -981,6 +1097,8 @@ void Engine::Render(float elapsedTime) {
m_player.ApplyTransformation(skybox, false); // Version d'ApplyTransformation qui ne tient compte que de la rotation
// (donc l'objet ne bouge pas relativement au joueur, ce qui est pratique pour une skybox!).
m_player.ApplyTransformation(remotePlayer, true, false);
if (m_mouseWU) bloc++;
else if (m_mouseWD) bloc--;
if (bloc == BTYPE_LAST + 1) bloc = BTYPE_AIR + 1;
@ -1016,7 +1134,7 @@ void Engine::Render(float elapsedTime) {
for (int x = 0; x < MAX_BULLETS; ++x) { // Array de bullets en jeu.
if (m_bullets[x]) {
for (int b = 0; b < BULLET_UPDATES_PER_FRAME; ++b) {
if (m_bullets[x]->Update(&m_world, elapsedTime, BULLET_UPDATES_PER_FRAME)) {
if (m_bullets[x]->Update(&m_world, elapsedTime, BULLET_UPDATES_PER_FRAME, m_players)) {
m_bullets[x]->~Bullet();
if (m_whoosh[x])
m_whoosh[x]->drop();
@ -1035,16 +1153,31 @@ void Engine::Render(float elapsedTime) {
}
}
m_renderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
m_remotePlayer.ApplyPhysics(Vector3f(0,0,0), &m_world, elapsedTime);
//m_remotePlayer.ApplyTransformation(remotePlayer, false);
m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo);
m_renderer.UpdateMesh(&m_world, m_player.GetPosition(), m_blockinfo);
glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
m_remotePlayer.Render(m_textureAtlas, m_shader01, all, elapsedTime);
if (m_isSkybox) m_skybox.Render(skybox);
if (m_isSkybox) m_renderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
DrawHud(elapsedTime, bloc);
DisplayPovGun();
//glClear(GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
//m_remotePlayer.Render(m_textureAtlas, m_shader01, all, elapsedTime);
//if (m_isSkybox) m_skybox.Render(skybox);
if (m_isSkybox) DrawHud(elapsedTime, bloc);
if (m_isSkybox) DisplayPovGun();
ProcessNotificationQueue();
if (m_damage)
{
InstantDamage();
}
static bool fell = false;
if (m_player.GetPosition().y < 1.7f && !fell) {
m_audio.Create3DAudioObj(m_scream, AUDIO_PATH "scream.wav", m_player.GetPOV(), m_player.GetVelocity(), false, 1.f);
@ -1055,15 +1188,26 @@ void Engine::Render(float elapsedTime) {
fell = false;
}
if (m_networkgame) {
static char* buf = new char[BUFFER_LENGTH];
uint32_t buflen = BUFFER_LENGTH;
netprot::Input input;
//sockaddr_in addr = m_conn.m_srvsockaddr;
if (m_networkgame) { // Pour se gerer le paquet.
using namespace std::chrono;
using namespace netprot;
Timestamp tstamp = duration_cast<milliseconds>(high_resolution_clock::now() - m_startTime).count();
Input input;
Sync sync;
uint64_t id = m_conn.getId();
static std::vector<char*> lsPck;
if (false) { // TODO: Faire un checkup pour chaque ~1000ms.
sync.sid = id;
sync.timestamp = tstamp;
sync.position = m_player.GetPosition();
sync.hp = m_player.GetHP();
// TODO: Garrocher ca quelque-part.
}
input.sid = id;
input.direction = m_player.GetDirection();
input.sid = m_conn.getId();
input.timestamp = 12345;
input.timestamp = tstamp;
input.keys.forward = m_keyW;
input.keys.backward = m_keyS;
input.keys.left = m_keyA;
@ -1072,16 +1216,52 @@ void Engine::Render(float elapsedTime) {
input.keys.block = m_mouseR;
input.keys.shoot = m_mouseL;
//netprot::Serialize(&input, &buf, &buflen);
//sendto(m_conn.m_sock_udp, buf, buflen, 0, (sockaddr*)&addr, sizeof(addr));
sendPackTo<Input>(m_conn.m_sock_udp, &input, &m_bufout, &m_conn.m_srvsockaddr);
netprot::sendPackTo<netprot::Input>(m_conn.m_sock_udp, &input, &buf, &buflen, &m_conn.m_srvsockaddr);
lsPck = recvPacks(m_conn.m_sock_udp, &m_buf);
char* prevptr = nullptr;
for (auto& pck : lsPck) { // We could make a few threads out of this.
Sync sync;
Output out;
if (!prevptr)
prevptr = m_buf.ptr;
uint32_t bsize = m_buf.len - (pck - prevptr);
prevptr = pck;
switch (getType(pck, 1)) {
using enum PACKET_TYPE;
case SYNC:
if (Deserialize(&sync, pck, &bsize)) {
if (sync.sid != m_conn.getId())
break;
// TODO: Vérifier si les positions concordent au sync local.
}
break;
case OUTPUT:
if (Deserialize(&out, pck, &bsize)) {
RemotePlayer* r = (RemotePlayer*)m_players[out.id];
r->Feed(out);
}
break;
default:
break;
}
}
lsPck.clear();
}
}
else if (m_gamestate == GameState::MAIN_MENU || m_gamestate == GameState::OPTIONS)
{
if (!m_soloMultiChoiceMade) {
DisplaySingleOrMultiplayerMenu();
}
else {
DrawMenu();
}
}
else if (m_gamestate == GameState::PAUSE)
{
DrawPause();
}
else if (m_gamestate == GameState::QUIT)
Stop();
}
@ -1109,7 +1289,14 @@ void Engine::KeyPressEvent(unsigned char key) {
}
break;
case 36: // ESC - Quitter
m_gamestate = GameState::MAIN_MENU;
if (m_gamestate == GameState::PLAY)
{
m_gamestate = GameState::PAUSE;
}
else if (m_gamestate == GameState::PAUSE)
{
m_gamestate = GameState::PLAY;
}
//Stop();
break;
case 57: // Space - Sauter
@ -1140,6 +1327,8 @@ void Engine::KeyPressEvent(unsigned char key) {
break;
case 8: // I - Ignorer
break;
case 9: // J - InstantDamage
m_damage = true;
case 15: // P - Ignorer
break;
case 17: // R - Ignorer
@ -1274,6 +1463,37 @@ void Engine::MousePressEvent(const MOUSE_BUTTON& button, int x, int y) {
if ((m_mousemx >= 305 && m_mousemx <= 450) && (m_mousemy >= 300 && m_mousemy <= 400))
m_gamestate = GameState::QUIT;
}
else if (m_gamestate == GameState::OPTIONS)
{
float buttonWidthProportion = 0.4f;
float buttonHeightProportion = 0.075f;
float buttonWidth = buttonWidthProportion * Width();
float buttonHeight = buttonHeightProportion * Height();
float offsetSingleButtonXFactor = 0.075f;
float offsetSingleButtonYFactor = 0.05f;
float buttonPosX = m_titleX;
float buttonSinglePosY = m_titleY - buttonHeight - (offsetSingleButtonYFactor * Height());
float buttonMultiPosY = buttonSinglePosY * 0.75;
float adjustedMouseY = Height() - m_mousemy;
// Single Player
if (m_mousemx >= buttonPosX && m_mousemx <= (buttonPosX + buttonWidth) &&
adjustedMouseY >= buttonSinglePosY && adjustedMouseY <= (buttonSinglePosY + buttonHeight))
{
std::cout << "Single Player button clicked" << std::endl;
m_soloMultiChoiceMade = true;
m_gamestate = GameState::PLAY;
}
// Multiplayer
else if (m_mousemx >= buttonPosX && m_mousemx <= (buttonPosX + buttonWidth) &&
adjustedMouseY >= buttonMultiPosY && adjustedMouseY <= (buttonMultiPosY + buttonHeight))
{
std::cout << "Multiplayer button clicked" << std::endl;
m_soloMultiChoiceMade = true;
m_gamestate = GameState::PLAY;
}
}
}
void Engine::MouseReleaseEvent(const MOUSE_BUTTON& button, int x, int y) {

33
SQCSim2021/engine.h
View File

@ -2,7 +2,9 @@
#define ENGINE_H__
#include <algorithm>
#include <chrono>
#include <cmath>
#include <unordered_map>
#include "../SQCSim-common/array2d.h"
#include "../SQCSim-common/blockinfo.h"
#include "../SQCSim-common/boostinfo.h"
@ -22,11 +24,13 @@
#include "renderer.h"
#include "remoteplayer.h"
class Engine : public OpenglContext {
public:
Engine();
virtual ~Engine();
virtual void DrawMenu();
virtual void DrawPause();
virtual void DrawSplachScreen();
virtual void Init();
virtual void DeInit();
@ -40,13 +44,12 @@ public:
virtual void MouseReleaseEvent(const MOUSE_BUTTON &button, int x, int y);
private:
std::pair<float, float> GetScale() const;
int GetFps(float elapsedTime) const;
int GetCountdown(float elapsedTime);
bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
void InstantDamage();
void SystemNotification(std::string systemLog);
void KillNotification(Player killer, Player killed);
void DisplayNotification(std::string message);
@ -60,6 +63,9 @@ private:
void DrawHud(float elapsedTime, BlockType bloc);
void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
Connector m_conn;
Shader m_shader01;
BlockInfo* m_blockinfo[BTYPE_LAST];
@ -75,6 +81,8 @@ private:
Texture m_texturePovGun;
Texture m_textureSkybox;
Texture m_textureSoloMultiMenu;
Texture m_textureSoloText;
Texture m_textureMultiText;
Texture m_textureTitle;
Skybox m_skybox;
@ -88,26 +96,36 @@ private:
Bullet* m_bullets[MAX_BULLETS];
std::map<uint64_t, RemotePlayer*> m_players;
std::unordered_map<uint64_t, Player*> m_players;
netprot::Buffer m_buf, m_bufout;
std::chrono::high_resolution_clock::time_point m_startTime;
//Menu
enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };
enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY, PAUSE };
GameState m_gamestate = GameState::MAIN_MENU;
Texture MenuTitleTexture;
Texture MenuBGTexture;
Texture MenuStartTexture;
Texture MenuQuitTexture;
Texture MenuOptionsTexture;
Texture PauseBGTexture;
Texture SplachScreenTexture;
float m_scale;
float m_time = 0;
float m_time_SplashScreen = 0;
float m_titleX = 0;
float m_titleY = 0;
float m_Width = 0;
float m_Height = 0;
int m_renderCount = 0;
int m_countdown = COUNTDOWN;
int m_nbReductionChunk = 4;
int m_timerReductionChunk = 30;
bool m_damage = false;
bool m_wireframe = false;
bool m_isSkybox = true;
@ -115,9 +133,9 @@ private:
bool m_flash = true;
bool m_displayCrosshair = true;
bool m_displayHud = true;
bool m_displayInfo = false;
bool m_displayInfo = true;
bool m_resetcountdown = false;
bool m_soloMultiChoiceMade = true;
bool m_soloMultiChoiceMade = false;
bool m_stopcountdown = false;
bool m_keyK = false;
@ -137,7 +155,8 @@ private:
float m_mousemy = 0;
bool m_networkgame = false;
netprot::PlayerInfo m_pinfo;
RemotePlayer m_remotePlayer = RemotePlayer(netprot::PlayerInfo(),Vector3f(5.5f, CHUNK_SIZE_Y + 1.8f, 5.5f));
std::string m_messageNotification = "";
};

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumping/BlueBackJumpLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 262 KiB

After

Width:  |  Height:  |  Size: 270 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumping/BlueBackJumpRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 261 KiB

After

Width:  |  Height:  |  Size: 270 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumping/BlueFrontJumpRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 363 KiB

After

Width:  |  Height:  |  Size: 367 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumping/BlueLeftBackJumpLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 249 KiB

After

Width:  |  Height:  |  Size: 255 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumping/BlueLeftFrontJumpLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 KiB

After

Width:  |  Height:  |  Size: 314 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumping/BlueRightBackJumpRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 249 KiB

After

Width:  |  Height:  |  Size: 255 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumping/BlueRightFrontJumpRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 308 KiB

After

Width:  |  Height:  |  Size: 314 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/BlueBackJumpLeftShootingLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 254 KiB

After

Width:  |  Height:  |  Size: 264 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/BlueBackJumpRightShootingRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 255 KiB

After

Width:  |  Height:  |  Size: 264 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/BlueBackLeftJumpLeftShootingLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 270 KiB

After

Width:  |  Height:  |  Size: 277 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/BlueBackRightJumpRightShootingRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 269 KiB

After

Width:  |  Height:  |  Size: 276 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/BlueFrontJumpLeftShootingLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 310 KiB

After

Width:  |  Height:  |  Size: 320 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/BlueFrontJumpRightShootingRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 310 KiB

After

Width:  |  Height:  |  Size: 320 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/BlueFrontLeftJumpLeftShootingLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 359 KiB

After

Width:  |  Height:  |  Size: 363 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/BlueFrontRightJumpRightShootingRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 360 KiB

After

Width:  |  Height:  |  Size: 363 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/BlueProfilLeftJumpLeftShootingLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 367 KiB

After

Width:  |  Height:  |  Size: 365 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/BluerProfilRightJumprightShootingRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 368 KiB

After

Width:  |  Height:  |  Size: 365 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackJumpLeftShootingLeftShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 327 KiB

After

Width:  |  Height:  |  Size: 337 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackJumpLeftShootingLeftShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 348 KiB

After

Width:  |  Height:  |  Size: 360 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackJumpLeftShootingLeftShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 382 KiB

After

Width:  |  Height:  |  Size: 394 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackJumpRightShootingRightShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 327 KiB

After

Width:  |  Height:  |  Size: 338 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackJumpRightShootingRightShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 329 KiB

After

Width:  |  Height:  |  Size: 339 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackJumpRightShootingRightShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 362 KiB

After

Width:  |  Height:  |  Size: 374 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackLeftJumpLeftShootingLeftShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 641 KiB

After

Width:  |  Height:  |  Size: 643 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackLeftJumpLeftShootingLeftShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 654 KiB

After

Width:  |  Height:  |  Size: 656 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackLeftJumpLeftShootingLeftShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 651 KiB

After

Width:  |  Height:  |  Size: 653 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackRightJumpRightShootingRightShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 640 KiB

After

Width:  |  Height:  |  Size: 642 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackRightJumpRightShootingRightShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 654 KiB

After

Width:  |  Height:  |  Size: 656 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueBackRightJumpRightShootingRightShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 650 KiB

After

Width:  |  Height:  |  Size: 652 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontJumpLeftShootingLeftShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 474 KiB

After

Width:  |  Height:  |  Size: 485 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontJumpLeftShootingLeftShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 501 KiB

After

Width:  |  Height:  |  Size: 512 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontJumpLeftShootingLeftShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 563 KiB

After

Width:  |  Height:  |  Size: 575 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontJumpRightShootingRightShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 473 KiB

After

Width:  |  Height:  |  Size: 484 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontJumpRightShootingRightShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 500 KiB

After

Width:  |  Height:  |  Size: 512 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontJumpRightShootingRightShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 563 KiB

After

Width:  |  Height:  |  Size: 575 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontLeftJumpLeftShootingLeftShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 698 KiB

After

Width:  |  Height:  |  Size: 694 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontLeftJumpLeftShootingLeftShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 719 KiB

After

Width:  |  Height:  |  Size: 716 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontLeftJumpLeftShootingLeftShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 735 KiB

After

Width:  |  Height:  |  Size: 732 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontRightJumpRightShootingRightShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 698 KiB

After

Width:  |  Height:  |  Size: 694 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontRightJumpRightShootingRightShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 719 KiB

After

Width:  |  Height:  |  Size: 715 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueFrontRightJumpRightShootingRightShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 735 KiB

After

Width:  |  Height:  |  Size: 731 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueProfilLeftJumpLeftShootingLeftShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 760 KiB

After

Width:  |  Height:  |  Size: 598 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueProfilLeftJumpLeftShootingLeftShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 783 KiB

After

Width:  |  Height:  |  Size: 629 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BlueProfilLeftJumpLeftShootingLeftShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 804 KiB

After

Width:  |  Height:  |  Size: 649 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BluerProfilRightJumprightShootingRightShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 760 KiB

After

Width:  |  Height:  |  Size: 584 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BluerProfilRightJumprightShootingRightShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 783 KiB

After

Width:  |  Height:  |  Size: 644 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumpingShooting/ShootingJump/BluerProfilRightJumprightShootingRightShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 804 KiB

After

Width:  |  Height:  |  Size: 646 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/BlueBackLeftShootingLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 276 KiB

After

Width:  |  Height:  |  Size: 284 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/BlueBackRightShootingRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 276 KiB

After

Width:  |  Height:  |  Size: 283 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/BlueFrontLeftShootingLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 KiB

After

Width:  |  Height:  |  Size: 326 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/BlueFrontRightShootingRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 315 KiB

After

Width:  |  Height:  |  Size: 326 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/BlueLeftShootingLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 338 KiB

After

Width:  |  Height:  |  Size: 342 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/BlueProfilShootingLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 395 KiB

After

Width:  |  Height:  |  Size: 392 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/BlueProfilShootingRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 395 KiB

After

Width:  |  Height:  |  Size: 391 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/BlueRightShootingRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 338 KiB

After

Width:  |  Height:  |  Size: 342 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/BlueShootingBackLeft.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 258 KiB

After

Width:  |  Height:  |  Size: 268 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/BlueShootingBackRight.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 258 KiB

After

Width:  |  Height:  |  Size: 268 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueBackLeftShootingLeftShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 655 KiB

After

Width:  |  Height:  |  Size: 657 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueBackLeftShootingLeftShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 658 KiB

After

Width:  |  Height:  |  Size: 660 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueBackLeftShootingLeftShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 679 KiB

After

Width:  |  Height:  |  Size: 680 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueBackRightShootingRightShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 654 KiB

After

Width:  |  Height:  |  Size: 656 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueBackRightShootingRightShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 657 KiB

After

Width:  |  Height:  |  Size: 659 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueBackRightShootingRightShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 678 KiB

After

Width:  |  Height:  |  Size: 680 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueFrontLeftShootingLeftShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 473 KiB

After

Width:  |  Height:  |  Size: 486 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueFrontLeftShootingLeftShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 481 KiB

After

Width:  |  Height:  |  Size: 494 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueFrontLeftShootingLeftShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 504 KiB

After

Width:  |  Height:  |  Size: 517 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueFrontRightShootingRightShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 474 KiB

After

Width:  |  Height:  |  Size: 486 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueFrontRightShootingRightShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 481 KiB

After

Width:  |  Height:  |  Size: 493 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueFrontRightShootingRightShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 505 KiB

After

Width:  |  Height:  |  Size: 517 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueLeftShootingLeftShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 688 KiB

After

Width:  |  Height:  |  Size: 680 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueLeftShootingLeftShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 701 KiB

After

Width:  |  Height:  |  Size: 695 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueLeftShootingLeftShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 715 KiB

After

Width:  |  Height:  |  Size: 710 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueProfilShootingLeftShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 843 KiB

After

Width:  |  Height:  |  Size: 678 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueProfilShootingLeftShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 874 KiB

After

Width:  |  Height:  |  Size: 701 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueProfilShootingLeftShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 891 KiB

After

Width:  |  Height:  |  Size: 728 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueProfilShootingRightShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 842 KiB

After

Width:  |  Height:  |  Size: 672 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueProfilShootingRightShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 874 KiB

After

Width:  |  Height:  |  Size: 696 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueProfilShootingRightShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 891 KiB

After

Width:  |  Height:  |  Size: 732 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueRightShootingRightShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 688 KiB

After

Width:  |  Height:  |  Size: 679 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueRightShootingRightShoot2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 701 KiB

After

Width:  |  Height:  |  Size: 694 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueRightShootingRightShoot3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 715 KiB

After

Width:  |  Height:  |  Size: 710 KiB

BIN
SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGShooting/Shooting/BlueShootingBackLeftShoot1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 397 KiB

After

Width:  |  Height:  |  Size: 410 KiB

Some files were not shown because too many files have changed in this diff Show More