Subversion Repositories QTron

Compare Revisions

Regard whitespace Rev 1 → Rev 17

/ui_mainwindow.h
File deleted
/mainwindow.ui
File deleted
/bike.cpp
13,7 → 13,6
x = rand() % 800;
y = rand() % 600;
linePoints.append(QPoint(x, y));
linePoints.append(QPoint(x, y));
 
velocity = 1;
angle = 0;
22,6 → 21,7
isReady = false;
hadGo = false;
dead = false;
collided = false;
 
colour.setBlue(0);
colour.setRed(0);
36,7 → 36,7
}
}
 
void Bike::draw(QPainter *painter)
void Bike::draw(QPainter *painter, QList<Bike *> bikes)
{
if (show)
{
61,6 → 61,10
painter->drawLine(point1, point2);
}
 
if (!collided)
{
collided = hasCollided(bikes);
 
if (angle == 0)
{
y -= velocity;
77,6 → 81,11
{
x -= velocity;
}
}
else
{
linePoints.clear();
}
 
if (angle == 0 || angle == 180)
{
98,7 → 107,7
Bike *bike = bikes[i];
if (bike->isReady && bike->show)
{
if (bike->dead)
if (bike->dead || bike->collided)
{
socket->write("DEAD ");
socket->write(bike->name.toAscii());
112,11 → 121,19
socket->write(QString::number(bike->x).toAscii());
socket->write(" ");
socket->write(QString::number(bike->y).toAscii());
socket->write(" ");
socket->write(QString::number(bike->colour.red()).toAscii());
socket->write(" ");
socket->write(QString::number(bike->colour.green()).toAscii());
socket->write(" ");
socket->write(QString::number(bike->colour.blue()).toAscii());
socket->write("\n");
}
}
}
 
linePoints.append(QPoint(x, y));
 
if (dead)
{
show = false;
145,6 → 162,61
hasHadGo = true;
}
 
int sign(float x){
if(x > 0.0){
return 1;
}
if(x < 0.0){
return -1;
}
return 0;
}
 
bool Bike::hasCollided(QList<Bike *> bikes)
{
// Do collision detection here
// use linePoints
int i = linePoints.count() - 1;
if(linePoints[i-1].x() < 0 || linePoints[i-1].x() > 800 || linePoints[i-1].y() < 0 || linePoints[i-1].y() > 600)
return true;
if(linePoints[i].x() < 0 || linePoints[i].x() > 800 || linePoints[i].y() < 0 || linePoints[i].y() > 600)
return true;
int j, r;
Bike *bike;
for(int r = 0; r < bikes.count(); r++)
{
bike = bikes[r];
for(j = 0; j < bike->linePoints.count() - 1; j++)
{
if(!(bike->linePoints[j].x() == bike->linePoints[j+1].x() && linePoints[i].x() == linePoints[i-1].x()) && !(bike->linePoints[j].y() == bike->linePoints[j+1].y() && linePoints[i].y() == linePoints[i-1].y()))
{
 
// If not parallel
if(bike->linePoints[j].x() == bike->linePoints[j+1].x())
{
// x equal
 
if(linePoints[i-1].x() > bike->linePoints[j].x() && linePoints[i].x() < bike->linePoints[j].x() || linePoints[i-1].x() < bike->linePoints[j].x() && linePoints[i].x() > bike->linePoints[j].x())
{
if((sign(linePoints[i-1].y() - bike->linePoints[j].y()) != sign(linePoints[i-1].y() - bike->linePoints[j+1].y())))
return true;
}
}
else if(bike->linePoints[j].y() == bike->linePoints[j+1].y())
{
 
if(linePoints[i-1].y() > bike->linePoints[j].y() && linePoints[i].y() < bike->linePoints[j].y() || linePoints[i-1].y() < bike->linePoints[j].y() && linePoints[i].y() > bike->linePoints[j].y())
{
if((sign(linePoints[i-1].x() - bike->linePoints[j].x()) != sign(linePoints[i-1].x() - bike->linePoints[j+1].x())))
return true;
}
}
}
}
}
return false;
}
 
void Bike::reset()
{
x = rand() % 800;
152,7 → 224,6
linePoints.clear();
 
linePoints.append(QPoint(x, y));
linePoints.append(QPoint(x, y));
 
velocity = 1;
angle = 0;
160,6 → 231,7
isReady = true;
hadGo = false;
dead = false;
collided = false;
 
socket->write("RESET\n");
}
173,7 → 245,6
 
if (line == "L")
{
linePoints.append(QPoint(x, y));
angle -= 90;
 
if (angle >= 360)
188,7 → 259,6
}
else if (line == "R")
{
linePoints.append(QPoint(x, y));
angle += 90;
 
if (angle >= 360)
203,19 → 273,16
}
else if (line == "A")
{
linePoints[linePoints.size() - 1] = QPoint(x, y);
velocity += 0.1;
hadGo = true;
}
else if (line == "D")
{
linePoints[linePoints.size() - 1] = QPoint(x, y);
velocity -= 0.2;
hadGo = true;
}
else if (line == "N")
{
linePoints[linePoints.size() - 1] = QPoint(x, y);
hadGo = true;
}
else if (line.startsWith("NAME "))
231,11 → 298,11
{
colour.setRed(list[1].toInt());
}
else if (list.count() >= 3)
if (list.count() >= 3)
{
colour.setGreen(list[2].toInt());
}
else if (list.count() >= 4)
if (list.count() >= 4)
{
colour.setBlue(list[3].toInt());
}
/bike.h
17,8 → 17,9
 
public:
Bike(QTcpSocket *sock, int i);
void draw(QPainter *painter);
void draw(QPainter *painter,QList<Bike *> bikes);
void run(QList<Bike *> bikes);
bool hasCollided(QList<Bike *> bikes);
void reset();
bool isReady;
bool dead;
32,11 → 33,12
int id;
bool isDisconnected;
bool hasHadGo;
QColor colour;
bool collided;
 
private:
QTcpSocket *socket;
float velocity;
QColor colour;
 
private slots:
void readyRead();
/mainwindow.cpp
1,16 → 1,10
#include "mainwindow.h"
#include "ui_mainwindow.h"
 
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
QGLWidget(parent)
{
ui->setupUi(this);
this->setFixedSize(800, 600);
 
this->setMinimumSize(800, 600);
this->resize(800, 600);
this->setMaximumSize(800, 600);
 
server = new QTcpServer(this);
connect(server, SIGNAL(newConnection()), this, SLOT(newConnection()));
server->listen(QHostAddress::Any, 4567);
24,7 → 18,6
 
MainWindow::~MainWindow()
{
delete ui;
delete server;
}
 
36,24 → 29,12
}
}
 
void MainWindow::changeEvent(QEvent *e)
{
QMainWindow::changeEvent(e);
switch (e->type()) {
case QEvent::LanguageChange:
ui->retranslateUi(this);
break;
default:
break;
}
}
 
void MainWindow::paintEvent(QPaintEvent *e)
{
e->accept();
QPainter painter(this);
 
painter.setRenderHint(QPainter::Antialiasing, true);
painter.fillRect(0, 0, 800, 600, Qt::white);
 
bool ready = true;
for (int i = 0; i < bikes.count(); i++)
72,15 → 53,24
{
bikes[i]->hasHadGo = false;
bikes[i]->run(bikes);
bikes[i]->draw(&painter);
}
}
Bike *bike;
foreach(bike,bikes){
while(!bike->hasHadGo){
foreach(bike,bikes)
{
while(!bike->hasHadGo)
{
}
}
 
for (int i = 0; i < bikes.count(); i++)
{
if (bikes[i]->show)
{
bikes[i]->draw(&painter,bikes);
}
}
}
 
checkClients();
}
/mainwindow.h
6,16 → 6,12
#include <QTcpServer>
#include <QList>
#include <QTimer>
#include <QGLWidget>
 
#include "bike.h"
 
namespace Ui
class MainWindow : public QGLWidget
{
class MainWindow;
}
 
class MainWindow : public QMainWindow
{
Q_OBJECT
 
public:
24,11 → 20,9
void reset();
 
protected:
void changeEvent(QEvent *e);
void paintEvent(QPaintEvent *e);
 
private:
Ui::MainWindow *ui;
QTcpServer *server;
QList<Bike *> bikes;
QTimer *timer;
/QTron.pro
1,7 → 1,7
# -------------------------------------------------
# Project created by QtCreator 2010-05-31T15:59:14
# -------------------------------------------------
QT += network
QT += network opengl
TARGET = QTron
TEMPLATE = app
SOURCES += main.cpp \
9,5 → 9,5
bike.cpp
HEADERS += mainwindow.h \
bike.h
FORMS += mainwindow.ui
FORMS +=
OTHER_FILES += docs.txt