beu/TrackManiaControl
1
0
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity

Corrected z values of Lists

Browse Source
This commit is contained in:
Jocy 2017-04-11 12:28:04 +02:00
parent e7eb70e000
commit 8d7a147295
5 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/Admin/AdminLists.php
View File

@ -148,7 +148,7 @@ class AdminLists implements ManialinkPageAnswerListener, CallbackListener, Usage
$playerFrame->addChild($lineQuad); $playerFrame->addChild($lineQuad);
$lineQuad->setSize($width, 4); $lineQuad->setSize($width, 4);
$lineQuad->setSubStyle($lineQuad::SUBSTYLE_BgPlayerCardBig); $lineQuad->setSubStyle($lineQuad::SUBSTYLE_BgPlayerCardBig);
$lineQuad->setZ(0.001); $lineQuad->setZ(-0.1);
} }
$labelLine = new LabelLine($playerFrame); $labelLine = new LabelLine($playerFrame);

2
core/Commands/HelpManager.php
View File

@ -238,7 +238,7 @@ class HelpManager implements CommandListener, CallbackListener, ManialinkPageAns
$playerFrame->addChild($lineQuad); $playerFrame->addChild($lineQuad);
$lineQuad->setSize($width, 4); $lineQuad->setSize($width, 4);
$lineQuad->setSubStyle($lineQuad::SUBSTYLE_BgPlayerCardBig); $lineQuad->setSubStyle($lineQuad::SUBSTYLE_BgPlayerCardBig);
$lineQuad->setZ(0.001); $lineQuad->setZ(-0.1);
} }
$labelLine = new LabelLine($playerFrame); $labelLine = new LabelLine($playerFrame);

2
core/ManiaExchange/ManiaExchangeList.php
View File

@ -231,7 +231,7 @@ class ManiaExchangeList implements CallbackListener, ManialinkPageAnswerListener
$mapFrame->addChild($lineQuad); $mapFrame->addChild($lineQuad);
$lineQuad->setSize($width, 4); $lineQuad->setSize($width, 4);
$lineQuad->setSubStyle($lineQuad::SUBSTYLE_BgPlayerCardBig); $lineQuad->setSubStyle($lineQuad::SUBSTYLE_BgPlayerCardBig);
$lineQuad->setZ(0.001); $lineQuad->setZ(-0.1);
} }
$time = Formatter::timeElapsedString(strtotime($map->updated)); $time = Formatter::timeElapsedString(strtotime($map->updated));

2
core/Maps/MapList.php
View File

@ -278,7 +278,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
$mapFrame->addChild($lineQuad); $mapFrame->addChild($lineQuad);
$lineQuad->setSize($width, 4); $lineQuad->setSize($width, 4);
$lineQuad->setSubStyle($lineQuad::SUBSTYLE_BgPlayerCardBig); $lineQuad->setSubStyle($lineQuad::SUBSTYLE_BgPlayerCardBig);
$lineQuad->setZ(0.001); $lineQuad->setZ(-0.1);
} }
if ($currentMap === $map) { if ($currentMap === $map) {

32
core/Players/PlayerList.php
View File

@ -157,8 +157,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$posY = $height / 2; $posY = $height / 2;
// Define z-values // Define z-values
$foregroundZ = 1; $backgroundZ = -0.1;
$backgroundZ = 0.5;
// Predefine Description Label // Predefine Description Label
$descriptionLabel = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultDescriptionLabel(); $descriptionLabel = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultDescriptionLabel();
@ -211,7 +210,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$labelLine->addLabelEntryText($listPlayer->login, $posX + 70, 26); $labelLine->addLabelEntryText($listPlayer->login, $posX + 70, 26);
$labelLine->addLabelEntryText($path, $posX + 101, 27); $labelLine->addLabelEntryText($path, $posX + 101, 27);
$labelLine->setPosZ($foregroundZ);
$labelLine->render(); $labelLine->render();
$playerFrame->setY($posY); $playerFrame->setY($posY);
@ -221,7 +219,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$currentQuad = new Quad_Icons64x64_1(); $currentQuad = new Quad_Icons64x64_1();
$playerFrame->addChild($currentQuad); $playerFrame->addChild($currentQuad);
$currentQuad->setX($posX + 3.5); $currentQuad->setX($posX + 3.5);
$currentQuad->setZ($foregroundZ);
$currentQuad->setSize(4, 4); $currentQuad->setSize(4, 4);
$currentQuad->setSubStyle($currentQuad::SUBSTYLE_ArrowBlue); $currentQuad->setSubStyle($currentQuad::SUBSTYLE_ArrowBlue);
} }
@ -232,7 +229,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$teamQuad = new Quad_Emblems(); $teamQuad = new Quad_Emblems();
$playerFrame->addChild($teamQuad); $playerFrame->addChild($teamQuad);
$teamQuad->setX($posX + 10); $teamQuad->setX($posX + 10);
$teamQuad->setZ($foregroundZ);
$teamQuad->setSize(3.8, 3.8); $teamQuad->setSize(3.8, 3.8);
switch ($listPlayer->teamId) { switch ($listPlayer->teamId) {
@ -248,7 +244,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$specQuad = new Quad_BgRaceScore2(); $specQuad = new Quad_BgRaceScore2();
$playerFrame->addChild($specQuad); $playerFrame->addChild($specQuad);
$specQuad->setX($posX + 10); $specQuad->setX($posX + 10);
$specQuad->setZ($foregroundZ);
$specQuad->setSubStyle($specQuad::SUBSTYLE_Spectator); $specQuad->setSubStyle($specQuad::SUBSTYLE_Spectator);
$specQuad->setSize(3.8, 3.8); $specQuad->setSize(3.8, 3.8);
} }
@ -260,7 +255,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$playerFrame->addChild($countryQuad); $playerFrame->addChild($countryQuad);
$countryQuad->setImageUrl("file://ZoneFlags/Login/{$listPlayer->login}/country"); $countryQuad->setImageUrl("file://ZoneFlags/Login/{$listPlayer->login}/country");
$countryQuad->setX($posX + 98); $countryQuad->setX($posX + 98);
$countryQuad->setZ($foregroundZ);
$countryQuad->setSize(4, 4); $countryQuad->setSize(4, 4);
$countryQuad->addTooltipLabelFeature($descriptionLabel, '$<' . $listPlayer->nickname . '$> from ' . $listPlayer->path); $countryQuad->addTooltipLabelFeature($descriptionLabel, '$<' . $listPlayer->nickname . '$> from ' . $listPlayer->path);
@ -270,14 +264,12 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$rightQuad = new Quad_BgRaceScore2(); $rightQuad = new Quad_BgRaceScore2();
$playerFrame->addChild($rightQuad); $playerFrame->addChild($rightQuad);
$rightQuad->setX($posX + 13); $rightQuad->setX($posX + 13);
$rightQuad->setZ($foregroundZ);
$rightQuad->setSize(7, 3.5); $rightQuad->setSize(7, 3.5);
$rightQuad->setSubStyle($rightQuad::SUBSTYLE_CupFinisher); $rightQuad->setSubStyle($rightQuad::SUBSTYLE_CupFinisher);
$rightLabel = new Label_Text(); $rightLabel = new Label_Text();
$playerFrame->addChild($rightLabel); $playerFrame->addChild($rightLabel);
$rightLabel->setX($posX + 13.9); $rightLabel->setX($posX + 13.9);
$rightLabel->setZ($foregroundZ);
$rightLabel->setText($this->maniaControl->getAuthenticationManager()->getAuthLevelAbbreviation($listPlayer->authLevel)); $rightLabel->setText($this->maniaControl->getAuthenticationManager()->getAuthLevelAbbreviation($listPlayer->authLevel));
$rightLabel->setTextSize(0.8); $rightLabel->setTextSize(0.8);
$rightLabel->setTextColor('fff'); $rightLabel->setTextColor('fff');
@ -289,7 +281,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$playerQuad = new Quad_Icons64x64_1(); $playerQuad = new Quad_Icons64x64_1();
$playerFrame->addChild($playerQuad); $playerFrame->addChild($playerQuad);
$playerQuad->setX($posX + 61); $playerQuad->setX($posX + 61);
$playerQuad->setZ($foregroundZ);
$playerQuad->setSize(2.7, 2.7); $playerQuad->setSize(2.7, 2.7);
$playerQuad->setSubStyle($playerQuad::SUBSTYLE_TrackInfo); $playerQuad->setSubStyle($playerQuad::SUBSTYLE_TrackInfo);
$playerQuad->setAction(self::ACTION_OPEN_PLAYER_DETAILED . '.' . $listPlayer->login); $playerQuad->setAction(self::ACTION_OPEN_PLAYER_DETAILED . '.' . $listPlayer->login);
@ -300,7 +291,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$playerQuad = new Quad_UIConstruction_Buttons(); $playerQuad = new Quad_UIConstruction_Buttons();
$playerFrame->addChild($playerQuad); $playerFrame->addChild($playerQuad);
$playerQuad->setX($posX + 64.5); $playerQuad->setX($posX + 64.5);
$playerQuad->setZ($foregroundZ);
$playerQuad->setSize(3.8, 3.8); $playerQuad->setSize(3.8, 3.8);
$playerQuad->setSubStyle($playerQuad::SUBSTYLE_Camera); $playerQuad->setSubStyle($playerQuad::SUBSTYLE_Camera);
$description = 'Spectate $<' . $listPlayer->nickname . '$>'; $description = 'Spectate $<' . $listPlayer->nickname . '$>';
@ -311,7 +301,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$playerQuad = new Quad_UIConstruction_Buttons(); $playerQuad = new Quad_UIConstruction_Buttons();
$playerFrame->addChild($playerQuad); $playerFrame->addChild($playerQuad);
$playerQuad->setX($posX + 68); $playerQuad->setX($posX + 68);
$playerQuad->setZ($foregroundZ);
$playerQuad->setSize(3.8, 3.8); $playerQuad->setSize(3.8, 3.8);
$playerQuad->setSubStyle($playerQuad::SUBSTYLE_Author); $playerQuad->setSubStyle($playerQuad::SUBSTYLE_Author);
$playerQuad->addPlayerProfileFeature($listPlayer->login); $playerQuad->addPlayerProfileFeature($listPlayer->login);
@ -325,7 +314,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
$playerQuad = new Quad_Icons64x64_1(); $playerQuad = new Quad_Icons64x64_1();
$playerFrame->addChild($playerQuad); $playerFrame->addChild($playerQuad);
$playerQuad->setX($posX + 132); $playerQuad->setX($posX + 132);
$playerQuad->setZ($foregroundZ);
$playerQuad->setSize(3.8, 3.8); $playerQuad->setSize(3.8, 3.8);
$playerQuad->setSubStyle($playerQuad::SUBSTYLE_Buddy); $playerQuad->setSubStyle($playerQuad::SUBSTYLE_Buddy);
$playerQuad->setAction(self::ACTION_PLAYER_ADV . '.' . $listPlayer->login); $playerQuad->setAction(self::ACTION_PLAYER_ADV . '.' . $listPlayer->login);
@ -340,8 +328,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
// Force to Red-Team Quad // Force to Red-Team Quad
$redQuad = new Quad_Emblems(); $redQuad = new Quad_Emblems();
$playerFrame->addChild($redQuad); $playerFrame->addChild($redQuad);
$redQuad->setX($posX + 145); $redQuad->setX($posX + 144);
$redQuad->setZ($foregroundZ);
$redQuad->setSize(3.8, 3.8); $redQuad->setSize(3.8, 3.8);
$redQuad->setSubStyle($redQuad::SUBSTYLE_2); $redQuad->setSubStyle($redQuad::SUBSTYLE_2);
$redQuad->setAction(self::ACTION_FORCE_RED . '.' . $listPlayer->login); $redQuad->setAction(self::ACTION_FORCE_RED . '.' . $listPlayer->login);
@ -353,8 +340,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
// Force to Blue-Team Quad // Force to Blue-Team Quad
$blueQuad = new Quad_Emblems(); $blueQuad = new Quad_Emblems();
$playerFrame->addChild($blueQuad); $playerFrame->addChild($blueQuad);
$blueQuad->setX($posX + 141); $blueQuad->setX($posX + 140);
$blueQuad->setZ($foregroundZ);
$blueQuad->setSize(3.8, 3.8); $blueQuad->setSize(3.8, 3.8);
$blueQuad->setSubStyle($blueQuad::SUBSTYLE_1); $blueQuad->setSubStyle($blueQuad::SUBSTYLE_1);
$blueQuad->setAction(self::ACTION_FORCE_BLUE . '.' . $listPlayer->login); $blueQuad->setAction(self::ACTION_FORCE_BLUE . '.' . $listPlayer->login);
@ -367,8 +353,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
// Kick Player Vote // Kick Player Vote
$kickQuad = new Quad_UIConstruction_Buttons(); $kickQuad = new Quad_UIConstruction_Buttons();
$playerFrame->addChild($kickQuad); $playerFrame->addChild($kickQuad);
$kickQuad->setX($posX + 141); $kickQuad->setX($posX + 140);
$kickQuad->setZ($foregroundZ);
$kickQuad->setSize(3.8, 3.8); $kickQuad->setSize(3.8, 3.8);
$kickQuad->setSubStyle($kickQuad::SUBSTYLE_Validate_Step2); $kickQuad->setSubStyle($kickQuad::SUBSTYLE_Validate_Step2);
$kickQuad->setAction(self::ACTION_KICK_PLAYER_VOTE . '.' . $listPlayer->login); $kickQuad->setAction(self::ACTION_KICK_PLAYER_VOTE . '.' . $listPlayer->login);
@ -381,8 +366,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
// Force to Play // Force to Play
$playQuad = new Quad_Emblems(); $playQuad = new Quad_Emblems();
$playerFrame->addChild($playQuad); $playerFrame->addChild($playQuad);
$playQuad->setX($posX + 143); $playQuad->setX($posX + 142);
$playQuad->setZ($foregroundZ);
$playQuad->setSize(3.8, 3.8); $playQuad->setSize(3.8, 3.8);
$playQuad->setSubStyle($playQuad::SUBSTYLE_2); $playQuad->setSubStyle($playQuad::SUBSTYLE_2);
$playQuad->setAction(self::ACTION_FORCE_PLAY . '.' . $listPlayer->login); $playQuad->setAction(self::ACTION_FORCE_PLAY . '.' . $listPlayer->login);
@ -396,8 +380,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
// Force to Spectator Quad // Force to Spectator Quad
$spectatorQuad = new Quad_BgRaceScore2(); $spectatorQuad = new Quad_BgRaceScore2();
$playerFrame->addChild($spectatorQuad); $playerFrame->addChild($spectatorQuad);
$spectatorQuad->setX($posX + 137); $spectatorQuad->setX($posX + 136);
$spectatorQuad->setZ($foregroundZ);
$spectatorQuad->setSize(3.8, 3.8); $spectatorQuad->setSize(3.8, 3.8);
$spectatorQuad->setSubStyle($spectatorQuad::SUBSTYLE_Spectator); $spectatorQuad->setSubStyle($spectatorQuad::SUBSTYLE_Spectator);
$spectatorQuad->setAction(self::ACTION_FORCE_SPEC . '.' . $listPlayer->login); $spectatorQuad->setAction(self::ACTION_FORCE_SPEC . '.' . $listPlayer->login);
@ -409,8 +392,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
// Force to Spectator Quad // Force to Spectator Quad
$spectatorQuad = new Quad_BgRaceScore2(); $spectatorQuad = new Quad_BgRaceScore2();
$playerFrame->addChild($spectatorQuad); $playerFrame->addChild($spectatorQuad);
$spectatorQuad->setX($posX + 137); $spectatorQuad->setX($posX + 136);
$spectatorQuad->setZ($foregroundZ);
$spectatorQuad->setSize(3.8, 3.8); $spectatorQuad->setSize(3.8, 3.8);
$spectatorQuad->setSubStyle($spectatorQuad::SUBSTYLE_Spectator); $spectatorQuad->setSubStyle($spectatorQuad::SUBSTYLE_Spectator);
$spectatorQuad->setAction(self::ACTION_FORCE_SPEC_VOTE . '.' . $listPlayer->login); $spectatorQuad->setAction(self::ACTION_FORCE_SPEC_VOTE . '.' . $listPlayer->login);