diff options
author | Brad Davis <[email protected]> | 2013-10-13 20:28:58 -0700 |
---|---|---|
committer | Brad Davis <[email protected]> | 2013-10-13 20:28:58 -0700 |
commit | 672cdd0ef5455cd62a0d7f7eb6b9889f3ea35f21 (patch) | |
tree | f3454dc864242744aef1ea5474b5011556d0f388 /Samples/CommonSrc/Platform/Platform.h | |
parent | 1408ed7b208c7a1cff1a2448fc890e9b8bd6dc4e (diff) |
Updating to cmake, glew, xrandr
Diffstat (limited to 'Samples/CommonSrc/Platform/Platform.h')
-rw-r--r-- | Samples/CommonSrc/Platform/Platform.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Samples/CommonSrc/Platform/Platform.h b/Samples/CommonSrc/Platform/Platform.h index 201aad6..992a3fa 100644 --- a/Samples/CommonSrc/Platform/Platform.h +++ b/Samples/CommonSrc/Platform/Platform.h @@ -79,7 +79,7 @@ typedef RenderDevice* (*RenderDeviceCreateFunc)(const Render::RendererParams&, v // used to build up a list of RenderDevices that can be used for rendering. // Specifying a smaller set allows application to avoid linking unused graphics devices. struct SetupGraphicsDeviceSet -{ +{ SetupGraphicsDeviceSet(const char* typeArg, RenderDeviceCreateFunc createFunc) : pTypeArg(typeArg), pCreateDevice(createFunc), pNext(0) { } SetupGraphicsDeviceSet(const char* typeArg, RenderDeviceCreateFunc createFunc, @@ -90,7 +90,7 @@ struct SetupGraphicsDeviceSet const SetupGraphicsDeviceSet* PickSetupDevice(const char* typeArg) const; const char* pTypeArg; - RenderDeviceCreateFunc pCreateDevice; + RenderDeviceCreateFunc pCreateDevice; private: const SetupGraphicsDeviceSet* pNext; @@ -111,7 +111,7 @@ protected: Application* pApp; Ptr<RenderDevice> pRender; Ptr<GamepadManager> pGamepadManager; - UInt64 StartupTicks; + UInt64 StartupTicks; public: PlatformCore(Application *app); @@ -126,10 +126,10 @@ public: virtual void Exit(int exitcode) = 0; virtual void ShowWindow(bool visible) = 0; - + virtual bool SetFullscreen(const Render::RendererParams& rp, int fullscreen); - - // Search for a matching graphics renderer based on type argument and initializes it. + + // Search for a matching graphics renderer based on type argument and initializes it. virtual RenderDevice* SetupGraphics(const SetupGraphicsDeviceSet& setupGraphicsDesc, const char* gtype, const Render::RendererParams& rp) = 0; @@ -142,10 +142,10 @@ public: virtual void PlayMusicFile(const char *fileName) { OVR_UNUSED(fileName); } virtual int GetDisplayCount() { return 0; } virtual Render::DisplayId GetDisplay(int screen); - + // Get time since start of application in seconds. - double GetAppTime() const; - + double GetAppTime() const; + virtual String GetContentDirectory() const { return "."; } }; @@ -161,7 +161,7 @@ protected: public: virtual ~Application() { } - virtual int OnStartup(int argc, const char** argv) = 0; + virtual int OnStartup(int argc, char** argv) = 0; virtual void OnQuitRequest() { pPlatform->Exit(0); } virtual void OnIdle() {} |