BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Tleety
2016-03-03 13:53:40 +01:00
parent 96bc5db7bb
commit f4983cf961
2 changed files with 65 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/ScoreIdentity.xml
+61 -43
View File
@@ -9,24 +9,17 @@
</Components> </Components>
<Children> <Children>
<Entity name="Simonplzpush">
<Components>
<c:Text>
<Content>Simon needs to push shit shit so i can write text from Component</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource>
</c:Text>
<c:Transform>
<Position X="0" Y="2.09157753" Z="0"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="ID"> <Entity name="ID">
<Components> <Components>
<c:Text> <c:Text>
<Content>ID</Content> <Content>-1</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/DroidSans.ttf,64</Resource>
</c:Text> </c:Text>
<c:TextFieldReader>
<ParentEntityName>ScoreIdentity</ParentEntityName>
<ComponentType>ScoreIdentity</ComponentType>
<Field>ID</Field>
</c:TextFieldReader>
<c:Transform> <c:Transform>
<Position X="-9.66245842" Y="0" Z="0"/> <Position X="-9.66245842" Y="0" Z="0"/>
</c:Transform> </c:Transform>
@@ -36,35 +29,16 @@
<Entity name="Name"> <Entity name="Name">
<Components> <Components>
<c:Text> <c:Text>
<Content>DickButt</Content> <Content></Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/DroidSans.ttf,64</Resource>
</c:Text> </c:Text>
<c:TextFieldReader>
<ParentEntityName>ScoreIdentity</ParentEntityName>
<ComponentType>ScoreIdentity</ComponentType>
<Field>Name</Field>
</c:TextFieldReader>
<c:Transform> <c:Transform>
<Position X="-5.08430147" Y="0" Z="0"/> <Position X="-6.30237818" Y="0" Z="0"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="Kills">
<Components>
<c:Text>
<Content>5</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource>
</c:Text>
<c:Transform>
<Position X="-1.23991621" Y="0" Z="0"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="Deaths">
<Components>
<c:Text>
<Content>12</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource>
</c:Text>
<c:Transform>
<Position X="1.3544426" Y="0" Z="0"/>
</c:Transform> </c:Transform>
</Components> </Components>
<Children/> <Children/>
@@ -72,11 +46,50 @@
<Entity name="KD"> <Entity name="KD">
<Components> <Components>
<c:Text> <c:Text>
<Content>0.42</Content> <Content>0</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/DroidSans.ttf,64</Resource>
</c:Text> </c:Text>
<c:TextFieldReader>
<ParentEntityName>ScoreIdentity</ParentEntityName>
<ComponentType>ScoreIdentity</ComponentType>
<Field>KD</Field>
</c:TextFieldReader>
<c:Transform> <c:Transform>
<Position X="4.43798256" Y="0" Z="0"/> <Position X="-1.88777053" Y="0" Z="0"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="Kills">
<Components>
<c:Text>
<Content>0</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource>
</c:Text>
<c:TextFieldReader>
<ParentEntityName>ScoreIdentity</ParentEntityName>
<ComponentType>ScoreIdentity</ComponentType>
<Field>Kills</Field>
</c:TextFieldReader>
<c:Transform>
<Position X="0.558054805" Y="0" Z="0"/>
</c:Transform>
</Components>
<Children/>
</Entity>
<Entity name="Deaths">
<Components>
<c:Text>
<Content>0</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource>
</c:Text>
<c:TextFieldReader>
<ParentEntityName>ScoreIdentity</ParentEntityName>
<ComponentType>ScoreIdentity</ComponentType>
<Field>Deaths</Field>
</c:TextFieldReader>
<c:Transform>
<Position X="2.71133566" Y="0" Z="0"/>
</c:Transform> </c:Transform>
</Components> </Components>
<Children/> <Children/>
@@ -84,11 +97,16 @@
<Entity name="Ping"> <Entity name="Ping">
<Components> <Components>
<c:Text> <c:Text>
<Content>84</Content> <Content>0</Content>
<Resource>Fonts/DroidSans.ttf,64</Resource> <Resource>Fonts/DroidSans.ttf,64</Resource>
</c:Text> </c:Text>
<c:TextFieldReader>
<ParentEntityName>ScoreIdentity</ParentEntityName>
<ComponentType>ScoreIdentity</ComponentType>
<Field>Ping</Field>
</c:TextFieldReader>
<c:Transform> <c:Transform>
<Position X="8.05187988" Y="0" Z="0"/> <Position X="5.79302835" Y="0" Z="0"/>
</c:Transform> </c:Transform>
</Components> </Components>
<Children/> <Children/>
src/Game/Systems/ScoreScreenSystem.cpp
+4 -3
View File
@@ -14,6 +14,10 @@ ScoreScreenSystem::ScoreScreenSystem(SystemParams params)
void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt) void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& capturePoint, double dt)
{ {
//TODO: Check team al //TODO: Check team al
if (!IsServer) {
return;
}
if(!entity.HasComponent("ScoreScreen")){ if(!entity.HasComponent("ScoreScreen")){
return; return;
} }
@@ -62,9 +66,6 @@ void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper&
(int&)cScoreIdentity["ID"] = data.ID; (int&)cScoreIdentity["ID"] = data.ID;
(int&)cScoreIdentity["Ping"] = 1337; (int&)cScoreIdentity["Ping"] = 1337;
std::string IdentityName = "#" + std::to_string(data.ID) + ": " + data.Name;
m_World->SetName(scoreIdentity.ID, IdentityName);
m_World->SetParent(scoreIdentity.ID, entity.ID); m_World->SetParent(scoreIdentity.ID, entity.ID);
} }
} }