Skip to content

Commit

Permalink
Updating UDP clients
Browse files Browse the repository at this point in the history
  • Loading branch information
@ricdays
ricdays committed Apr 26, 2017
1 parent b8b4418 commit 50eb8fc
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 116 deletions.
73 changes: 7 additions & 66 deletions AudienceClient/AudienceClient/AudienceClient.pro.user
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.0.1, 2016-07-22T14:10:07. -->
<!-- Written by QtCreator 3.0.1, 2017-02-16T18:34:53. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
Expand Down Expand Up @@ -51,9 +51,9 @@
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Unnamed</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Unnamed</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{9b107911-59f0-4a19-abd9-96a01eaf5ece}</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.6 (qt4)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 4.8.6 (qt4)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{160ffdf8-9be0-47a0-8d74-5b6b2f8ebeaf}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
Expand All @@ -65,8 +65,8 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
</valuemap>
Expand Down Expand Up @@ -116,66 +116,7 @@
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/ricardodias/RefBox2015/AudienceClient/build-AudienceClient-Unnamed-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
<value type="QString">-w</value>
<value type="QString">-r</value>
</valuelist>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
<value type="QString">-w</value>
<value type="QString">-r</value>
</valuelist>
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
Expand Down
54 changes: 8 additions & 46 deletions AudienceClient/AudienceClient/FieldWidget3D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ void FieldWidget3D::initAll()
{
drawField(renderer);
drawGoals(renderer);
renderWindow->Render();
initBalls(renderer);

// Camera properties
Expand Down Expand Up @@ -457,17 +458,20 @@ void FieldWidget3D::initBalls(vtkRenderer* renderer)

ball_teamA = vtkActor::New();
ball_teamA->SetMapper(sphereMapper);
renderer->AddActor(ball_teamA);

ball_teamA->GetProperty()->SetRepresentationToSurface();
ball_teamA->GetProperty()->SetColor(robotsColorR[0],robotsColorG[0],robotsColorB[0]);
ball_teamA->SetPosition(1000,1000,1000);
renderer->AddActor(ball_teamA);
ball_teamA->SetPosition(100.0,100.0,0.0);


ball_teamB = vtkActor::New();
ball_teamB->SetMapper(sphereMapper);
renderer->AddActor(ball_teamB);

ball_teamB->GetProperty()->SetRepresentationToSurface();
ball_teamB->GetProperty()->SetColor(robotsColorR[1],robotsColorG[1],robotsColorB[1]);
ball_teamB->SetPosition(1000,1000,1000);
renderer->AddActor(ball_teamB);
ball_teamB->SetPosition(100.0,100.0,0.0);
}

void FieldWidget3D::drawRobots(vtkActor** actor_array, Team* team)
Expand Down Expand Up @@ -512,48 +516,6 @@ vtkActor* FieldWidget3D::createText(QString text){
return actor;
}

vtkActor* FieldWidget3D::createBall(QVector3D pos, QColor color)
{
float ballRadius = 0.11;

vtkSmartPointer<vtkSphereSource> sphereSrc = vtkSmartPointer<vtkSphereSource>::New();
sphereSrc->SetRadius(ballRadius);
vtkSmartPointer<vtkPolyDataMapper> sphereMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
sphereMapper->SetInput(sphereSrc->GetOutput());

vtkActor* ball = vtkActor::New();
ball->SetMapper(sphereMapper);
ball->GetProperty()->SetRepresentationToSurface();
ball->GetProperty()->SetColor(color.red()/255.0, color.green()/255.0, color.blue()/255.0);

if(pos.x() == 0.0 && pos.y() == 0.0 && pos.z() == 0.0)
pos.setX(1000);

float posZ = (pos.z() < ballRadius) ? ballRadius : pos.z();
ball->SetPosition(pos.x(), pos.y(), posZ);
renderer->AddActor(ball);

return ball;
}

vtkActor* FieldWidget3D::createObstacle(){
// Obstacle actors
vtkSmartPointer<vtkCylinderSource> cylinder = vtkSmartPointer<vtkCylinderSource>::New();
cylinder->SetRadius(0.25);
cylinder->SetHeight(OBSTACLE_HEIGHT);
cylinder->SetResolution(12);
vtkSmartPointer<vtkPolyDataMapper> cylinderMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
cylinderMapper->SetInput(cylinder->GetOutput());

vtkActor* obstacleActor = vtkActor::New();
obstacleActor->SetMapper(cylinderMapper);
obstacleActor->GetProperty()->SetColor(0,0,0);
//obstacleActor->GetProperty()->SetRepresentationToWireframe();
obstacleActor->RotateX(90); // Rotate 90 degrees in XX axis

return obstacleActor;
}

bool FieldWidget3D::canOverlay()
{
return true;
Expand Down
4 changes: 0 additions & 4 deletions AudienceClient/AudienceClient/FieldWidget3D.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,6 @@ class FieldWidget3D : public QVTKWidget
void drawRobots(vtkActor** actor_array, Team* team);

vtkActor* createText(QString text);
vtkActor* createObstacle();
vtkActor* createDebugPt();
vtkActor* createDashedLine(float x1, float y1, float z1, float x2, float y2, float z2);
vtkActor* createBall(QVector3D pos, QColor color);
void createDot(vtkRenderer* renderer, float x, float y, bool black, float radius=0.05);

float robotsColorR[2];
Expand Down
Binary file removed AudienceClient/config/score_board.png
View file
Binary file not shown.
Binary file removed AudienceClient/config/score_board.xcf
View file
Binary file not shown.
Binary file removed AudienceClient/config/textoverlay_bg.png
View file
Binary file not shown.
Binary file removed AudienceClient/config/textoverlay_bg.xcf
View file
Binary file not shown.

0 comments on commit 50eb8fc

Please sign in to comment.