WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 06:53:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix main menu UI showing in demo, add menu button (not functional yet)

Browse Source
This commit is contained in:
elasota
2020-10-25 16:32:49 -04:00
parent b983d11009
commit f2052b835b
7 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ApplicationResourcePatches/PICT/1971.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
ApplicationResourcePatches/PICT/1972.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

2
ApplicationResourcePatches/manifest.json
View File

@@ -9,6 +9,8 @@
"DITL/2004.json" : "ApplicationResourcePatches/DITL/2004.json",
"DITL/2005.json" : "ApplicationResourcePatches/DITL/2005.json",
"DITL/2006.json" : "ApplicationResourcePatches/DITL/2006.json",
"PICT/1971.bmp" : "ApplicationResourcePatches/PICT/1971.bmp",
"PICT/1972.bmp" : "ApplicationResourcePatches/PICT/1972.bmp",
"PICT/1973.bmp" : "ApplicationResourcePatches/PICT/1973.bmp",
"PICT/1974.bmp" : "ApplicationResourcePatches/PICT/1974.bmp",
"PICT/1975.bmp" : "ApplicationResourcePatches/PICT/1975.bmp",

8
GpApp/GliderStructs.h
View File

@@ -369,7 +369,9 @@ namespace TouchScreenCtrlIDs
{
Bands,
BatteryHelium,
Movement,
Menu,
Movement, // Keep this last
Count,
@@ -432,6 +434,8 @@ namespace touchScreenControlGraphics
{
enum touchScreenControlGraphic
{
MenuActive,
MenuIdle,
BandsDisabled,
BandsActive,
BandsIdle,
@@ -451,7 +455,7 @@ namespace touchScreenControlGraphics
Count,
};
static const int kTouchScreenGraphicStartID = 1973;
static const int kTouchScreenGraphicStartID = 1971;
}
typedef touchScreenControlGraphics::touchScreenControlGraphic touchScreenControlGraphic_t;

5
GpApp/MainMenuUI.cpp
View File

@@ -12,6 +12,7 @@
#include "PLSysCalls.h"
#include "RenderedFont.h"
#include "GpRenderedFontMetrics.h"
#include "MainMenuUI.h"
#include "ResolveCachingColor.h"
#include "PLTimeTaggedVOSEvent.h"
#include "WindowDef.h"
@@ -397,9 +398,7 @@ static void HandleMainMenuUISelection(MainMenuUIState::ControlID controlID)
break;
case MainMenuUIState::Control_Demo:
DismissMainMenuUIPage();
DoOptionsMenu(iHelp);
StartMainMenuUI();
DoDemoGame(); // This handles main menu UI by itself
break;
case MainMenuUIState::Control_AboutApplication:

9
GpApp/Play.cpp
View File

@@ -12,6 +12,7 @@
#include "Externs.h"
#include "Environ.h"
#include "House.h"
#include "MainMenuUI.h"
#include "MainWindow.h"
#include "PLEventQueue.h"
#include "PLTimeTaggedVOSEvent.h"
@@ -278,9 +279,15 @@ void DoDemoGame (void)
PasStringCopy(theHousesSpecs[thisHouseIndex].m_name, thisHouseName);
if (OpenHouse())
{
if (thisMac.isTouchscreen)
DismissMainMenuUI();
whoCares = ReadHouse();
demoGoing = true;
NewGame(kNewGameMode);
if (thisMac.isTouchscreen)
StartMainMenuUI();
}
whoCares = CloseHouse();
thisHouseIndex = wasHouseIndex;
@@ -571,6 +578,7 @@ void ResetTouchScreenControlBounds (void)
points[TouchScreenCtrlIDs::Movement] = Point::Create(mainWindowRect.left, mainWindowRect.top);
points[TouchScreenCtrlIDs::BatteryHelium] = Point::Create(mainWindowRect.left + touchScreenControlEdgeSpacing, mainWindowRect.top + touchScreenControlEdgeSpacing);
points[TouchScreenCtrlIDs::Bands] = Point::Create(mainWindowRect.right - touchScreenControlEdgeSpacing - touchScreenControlSize, mainWindowRect.top + touchScreenControlEdgeSpacing);
points[TouchScreenCtrlIDs::Menu] = Point::Create(points[TouchScreenCtrlIDs::Bands].h - touchScreenControlInterSpacing - touchScreenControlSize, points[TouchScreenCtrlIDs::BatteryHelium].v);
for (int i = 0; i < TouchScreenCtrlIDs::Count; i++)
sizes[i] = Point::Create(touchScreenControlSize, touchScreenControlSize);
@@ -628,6 +636,7 @@ void PlayGame (void)
touchScreen.controls[TouchScreenCtrlIDs::Movement].isEnabled = true;
touchScreen.controls[TouchScreenCtrlIDs::Bands].isEnabled = true;
touchScreen.controls[TouchScreenCtrlIDs::BatteryHelium].isEnabled = true;
touchScreen.controls[TouchScreenCtrlIDs::Menu].isEnabled = true;
while ((playing) && (!quitting))
{

3
GpApp/Render.cpp
View File

@@ -622,6 +622,7 @@ void RenderTouchScreenControls (void)
ctrlGraphics[TouchScreenCtrlIDs::Movement] = nullptr;
ctrlGraphics[TouchScreenCtrlIDs::Bands] = touchScreen.graphics[touchScreenControlGraphics::BandsDisabled];
ctrlGraphics[TouchScreenCtrlIDs::BatteryHelium] = touchScreen.graphics[touchScreenControlGraphics::BatteryDisabled];
ctrlGraphics[TouchScreenCtrlIDs::Menu] = touchScreen.graphics[touchScreenControlGraphics::MenuIdle];
if (batteryTotal < 0)
ctrlGraphics[TouchScreenCtrlIDs::BatteryHelium] = touchScreen.graphics[touchScreenControlGraphics::HeliumIdle];
@@ -645,6 +646,8 @@ void RenderTouchScreenControls (void)
if (bandsTotal > 0)
ctrlGraphics[TouchScreenCtrlIDs::Bands] = touchScreen.graphics[touchScreenControlGraphics::BandsActive];
}
else if (touchScreen.fingers[i].capturingControl == TouchScreenCtrlIDs::Menu)
ctrlGraphics[TouchScreenCtrlIDs::Menu] = touchScreen.graphics[touchScreenControlGraphics::MenuActive];
}
for (int i = 0; i < TouchScreenCtrlIDs::Count; i++)