mirror of
https://github.com/elasota/Aerofoil.git
synced 2025-09-23 14:53:52 +00:00
Add FreeType, progress to title screen
This commit is contained in:
@@ -191,7 +191,7 @@ Boolean DoWeHaveSoundManager3 (void)
|
||||
|
||||
Boolean DoWeHaveQuickTime (void)
|
||||
{
|
||||
PL_NotYetImplemented_TODO();
|
||||
PL_NotYetImplemented_TODO("Movies");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -497,13 +497,14 @@ void HandleEvent (void)
|
||||
SelectTool(kSelectTool);
|
||||
}
|
||||
|
||||
// GP: Use WaitNextEvent to yield to the host
|
||||
//if (thisMac.hasWNE)
|
||||
// itHappened = WaitNextEvent(everyEvent, &theEvent, sleep, nil);
|
||||
itHappened = WaitNextEvent(everyEvent, &theEvent, sleep, nil);
|
||||
//else
|
||||
{
|
||||
// SystemTask();
|
||||
itHappened = GetNextEvent(everyEvent, &theEvent);
|
||||
}
|
||||
//{
|
||||
// // SystemTask();
|
||||
// itHappened = GetNextEvent(everyEvent, &theEvent);
|
||||
//}
|
||||
|
||||
if (itHappened)
|
||||
{
|
||||
|
@@ -61,24 +61,28 @@
|
||||
<Import Project="..\PortabilityLayer.props" />
|
||||
<Import Project="GpApp.props" />
|
||||
<Import Project="..\Common.props" />
|
||||
<Import Project="..\GpCommon.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\PortabilityLayer.props" />
|
||||
<Import Project="GpApp.props" />
|
||||
<Import Project="..\Common.props" />
|
||||
<Import Project="..\GpCommon.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\PortabilityLayer.props" />
|
||||
<Import Project="GpApp.props" />
|
||||
<Import Project="..\Common.props" />
|
||||
<Import Project="..\GpCommon.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\PortabilityLayer.props" />
|
||||
<Import Project="GpApp.props" />
|
||||
<Import Project="..\Common.props" />
|
||||
<Import Project="..\GpCommon.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup />
|
||||
|
@@ -3,8 +3,11 @@
|
||||
#include "DisplayDeviceManager.h"
|
||||
#include "HostAudioDriver.h"
|
||||
#include "HostFileSystem.h"
|
||||
#include "HostFontHandler.h"
|
||||
#include "HostDisplayDriver.h"
|
||||
#include "HostSystemServices.h"
|
||||
#include "HostVOSEventQueue.h"
|
||||
#include "WindowManager.h"
|
||||
|
||||
int gpAppMain();
|
||||
|
||||
@@ -13,10 +16,13 @@ class GpAppInterfaceImpl final : public GpAppInterface
|
||||
public:
|
||||
int ApplicationMain() override;
|
||||
void PL_IncrementTickCounter(uint32_t count) override;
|
||||
void PL_Render(IGpDisplayDriver *displayDriver) override;
|
||||
void PL_HostFileSystem_SetInstance(PortabilityLayer::HostFileSystem *instance) override;
|
||||
void PL_HostDisplayDriver_SetInstance(PortabilityLayer::HostDisplayDriver *instance) override;
|
||||
void PL_HostSystemServices_SetInstance(PortabilityLayer::HostSystemServices *instance) override;
|
||||
void PL_HostAudioDriver_SetInstance(PortabilityLayer::HostAudioDriver *instance) override;
|
||||
void PL_HostFontHandler_SetInstance(PortabilityLayer::HostFontHandler *instance) override;
|
||||
void PL_HostVOSEventQueue_SetInstance(PortabilityLayer::HostVOSEventQueue *instance) override;
|
||||
void PL_InstallHostSuspendHook(PortabilityLayer::HostSuspendHook_t hook, void *context) override;
|
||||
};
|
||||
|
||||
@@ -31,6 +37,11 @@ void GpAppInterfaceImpl::PL_IncrementTickCounter(uint32_t count)
|
||||
PortabilityLayer::DisplayDeviceManager::GetInstance()->IncrementTickCount(count);
|
||||
}
|
||||
|
||||
void GpAppInterfaceImpl::PL_Render(IGpDisplayDriver *displayDriver)
|
||||
{
|
||||
PortabilityLayer::WindowManager::GetInstance()->RenderFrame(displayDriver);
|
||||
}
|
||||
|
||||
void GpAppInterfaceImpl::PL_HostFileSystem_SetInstance(PortabilityLayer::HostFileSystem *instance)
|
||||
{
|
||||
PortabilityLayer::HostFileSystem::SetInstance(instance);
|
||||
@@ -51,6 +62,16 @@ void GpAppInterfaceImpl::PL_HostAudioDriver_SetInstance(PortabilityLayer::HostAu
|
||||
PortabilityLayer::HostAudioDriver::SetInstance(instance);
|
||||
}
|
||||
|
||||
void GpAppInterfaceImpl::PL_HostFontHandler_SetInstance(PortabilityLayer::HostFontHandler *instance)
|
||||
{
|
||||
PortabilityLayer::HostFontHandler::SetInstance(instance);
|
||||
}
|
||||
|
||||
void GpAppInterfaceImpl::PL_HostVOSEventQueue_SetInstance(PortabilityLayer::HostVOSEventQueue *instance)
|
||||
{
|
||||
PortabilityLayer::HostVOSEventQueue::SetInstance(instance);
|
||||
}
|
||||
|
||||
void GpAppInterfaceImpl::PL_InstallHostSuspendHook(PortabilityLayer::HostSuspendHook_t hook, void *context)
|
||||
{
|
||||
PortabilityLayer::InstallHostSuspendHook(hook, context);
|
||||
|
@@ -49,7 +49,7 @@ void InitializeMenus (void)
|
||||
appleMenu = GetMenu(kAppleMenuID);
|
||||
if (appleMenu == nil)
|
||||
RedAlert(kErrFailedResourceLoad);
|
||||
AppendResMenu(appleMenu, 'DRVR');
|
||||
//AppendResMenu(appleMenu, 'DRVR'); // GP: We don't support this
|
||||
InsertMenu(appleMenu, 0);
|
||||
|
||||
gameMenu = GetMenu(kGameMenuID);
|
||||
|
@@ -29,7 +29,8 @@ extern Boolean twoPlayerGame;
|
||||
|
||||
void SaveGame2 (void)
|
||||
{
|
||||
// Add NavServices later.
|
||||
PL_NotYetImplemented();
|
||||
// Add NavServices later.
|
||||
/*
|
||||
StandardFileReply theReply;
|
||||
FSSpec tempSpec;
|
||||
@@ -166,6 +167,7 @@ void SavedGameMismatchError (StringPtr gameName)
|
||||
|
||||
Boolean OpenSavedGame (void)
|
||||
{
|
||||
PL_NotYetImplemented();
|
||||
return false; // TEMP fix this iwth NavServices
|
||||
/*
|
||||
StandardFileReply theReply;
|
||||
|
Reference in New Issue
Block a user