This commit is contained in:
RandomityGuy 2021-06-29 17:15:37 +05:30
parent 1e9a1059d4
commit a8c14bca21
3 changed files with 31 additions and 14 deletions

View file

@ -65,8 +65,6 @@ class CameraController extends Object {
public var oob:Bool = false;
public var finish:Bool = false;
var originCube:Mesh;
public function new(marble:Marble) {
super();
this.marble = marble;
@ -74,11 +72,6 @@ class CameraController extends Object {
public function init(level:MarbleWorld) {
this.level = level;
var cub = Cube.defaultUnitCube();
cub.addUVs();
cub.scale(0.2);
cub.addNormals();
originCube = new Mesh(cub, Material.create(), level.scene);
Window.getInstance().addEventTarget(onEvent);
// level.scene.addEventListener(onEvent);
// Sdl.setRelativeMouseMode(true);

View file

@ -73,6 +73,8 @@ class EndGameGui extends GuiControl {
return domcasual32.toFont();
case "Arial14":
return arial14.toFont();
case "Expo32":
return expo32.toFont();
default:
return null;
}
@ -86,13 +88,22 @@ class EndGameGui extends GuiControl {
congrats.extent = new Vector(408, 50);
pg.addChild(congrats);
var finishMessage = new GuiText(expo32);
var finishMessage = new GuiMLText(expo32, mlFontLoader);
finishMessage.text.textColor = 0x00ff00;
finishMessage.text.text = "You've qualified!";
var qualified = mission.qualifyTime > timeState.gameplayClock;
if (qualified)
finishMessage.text.text = timeState.gameplayClock < mission.goldTime ? 'You beat the <font color="#FFFF00">GOLD</font> time!' : "You've qualified!";
else
finishMessage.text.text = '<font color="#FF0000">You failed to qualify!</font>';
finishMessage.text.filter = new DropShadow(1, 0.785, 0, 1, 0, 0.4, 1, true);
finishMessage.justify = Center;
// finishMessage.justify = Center;
finishMessage.position = new Vector(155, 65);
finishMessage.extent = new Vector(200, 100);
if (timeState.gameplayClock < mission.goldTime) {
finishMessage.position.x = 110;
}
if (!qualified)
finishMessage.position.x = 125;
finishMessage.extent = new Vector(400, 100);
pg.addChild(finishMessage);
var scoreData:Array<Score> = Settings.getScores(mission.path);

View file

@ -223,8 +223,6 @@ class PlayMissionGui extends GuiImage {
currentList = MissionList.beginnerMissions;
// TODO actual tab buttons
setCategoryFunc = function(category:String) {
localContainer.removeChild(tabBeginner);
localContainer.removeChild(tabIntermediate);
@ -279,6 +277,10 @@ class PlayMissionGui extends GuiImage {
return splits.join('\n');
}
var goldBadge = ResourceLoader.getImage("data/ui/play/goldscore.png").toTile();
goldBadge.dy = 2.5;
goldBadge.dx = 8;
setSelectedFunc = function setSelected(index:Int) {
if (index > currentList.length - 1) {
index = currentList.length - 1;
@ -307,6 +309,9 @@ class PlayMissionGui extends GuiImage {
var descText = '<font face="DomCasual24" color="#000000">${currentMission.title}</font><br/><br/>'
+ splitTextWithPadding(pmDescription.text, Util.unescape(currentMission.description));
if (currentMission.qualifyTime != Math.POSITIVE_INFINITY) {
descText += '<font face="DomCasual24"><br/>Time To Qualify: ${Util.formatTime(currentMission.qualifyTime)}</font>';
}
descText += '<br/><br/><font face="DomCasual24">Best Times:</font><br/>';
for (i in 0...3) {
descText += '<br/>ÂÂ<font face="ArialBold14">${i + 1}. ${scoreData[i].name}</font>';
@ -315,11 +320,19 @@ class PlayMissionGui extends GuiImage {
var descText2 = '<br/><br/>'
+ '<font opacity="0">${splitTextWithPadding(pmDescriptionOther.text, Util.unescape(currentMission.description))}</font>';
descText2 += '<br/><br/><br/>';
descText2 += '<br/><br/>';
if (currentMission.qualifyTime != Math.POSITIVE_INFINITY) {
descText2 += '<font face="DomCasual24" opacity="0"><br/>Time To Qualify: ${Util.formatTime(currentMission.qualifyTime)}</font>';
}
descText2 += '<br/>';
for (i in 0...3) {
descText2 += '<br/>ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ<font face="ArialBold14">${Util.formatTime(scoreData[i].time)}</font>';
if (scoreData[i].time < currentMission.goldTime) {
descText2 += '<img src="goldBadge.png"></img>';
}
}
pmDescriptionOther.text.text = descText2;
pmDescriptionOther.text.loadImage = (name) -> goldBadge;
pmPreview.bmp.tile = currentMission.getPreviewImage();