Level editor work

This commit is contained in:
elasota
2020-02-23 20:21:04 -05:00
parent d63ac98624
commit c78a20dafd
61 changed files with 1317 additions and 305 deletions

View File

@@ -5,6 +5,8 @@ namespace EGpStandardCursors
enum EGpStandardCursor
{
kArrow,
kIBeam,
kWait,
kHidden,
};
}

View File

@@ -1,10 +1,10 @@
#pragma once
#include "IGpColorCursor_Win32.h"
#include "IGpCursor_Win32.h"
#include "GpWindows.h"
class GpColorCursor_Win32 final : public IGpColorCursor_Win32
class GpCursor_Win32 final : public IGpCursor_Win32
{
public:
void Destroy() override;
@@ -14,11 +14,11 @@ public:
void IncRef() override;
void DecRef() override;
static GpColorCursor_Win32 *Load(const wchar_t *path);
static IGpCursor_Win32 *Load(const wchar_t *path);
private:
GpColorCursor_Win32(HCURSOR cursor);
~GpColorCursor_Win32();
GpCursor_Win32(HCURSOR cursor);
~GpCursor_Win32();
HCURSOR m_cursor;
int m_refCount;

View File

@@ -8,10 +8,11 @@
#undef CreateMutex
#undef DeleteFile
#undef LoadCursor
struct IGpFiber;
struct IGpColorCursor_Win32;
struct IGpBWCursor_Win32;
struct IGpCursor_Win32;
struct IGpVOSEventQueue;
struct GpWindowsGlobals
@@ -23,7 +24,6 @@ struct GpWindowsGlobals
int m_nCmdShow;
IGpFiber *(*m_createFiberFunc)(LPVOID fiber);
IGpColorCursor_Win32 *(*m_loadColorCursorFunc)(const wchar_t *path);
IGpCursor_Win32 *(*m_loadCursorFunc)(const wchar_t *path);
void (*m_translateWindowsMessageFunc)(const MSG *msg, IGpVOSEventQueue *eventQueue);
};

View File

@@ -1,6 +1,6 @@
#pragma once
struct IGpColorCursor
struct IGpCursor
{
virtual void Destroy() = 0;
};

View File

@@ -1,9 +1,9 @@
#pragma once
#include "IGpColorCursor.h"
#include "IGpCursor.h"
#include "GpWindows.h"
struct IGpColorCursor_Win32 : public IGpColorCursor
struct IGpCursor_Win32 : public IGpCursor
{
public:
virtual const HCURSOR &GetHCursor() const = 0;

View File

@@ -4,7 +4,7 @@
#include "EGpStandardCursor.h"
struct IGpDisplayDriverSurface;
struct IGpColorCursor;
struct IGpCursor;
// Display drivers are responsible for timing and calling the game tick function.
struct IGpDisplayDriver
@@ -16,10 +16,10 @@ public:
virtual void GetDisplayResolution(unsigned int *width, unsigned int *height, GpPixelFormat_t *bpp) = 0;
virtual IGpDisplayDriverSurface *CreateSurface(size_t width, size_t height, GpPixelFormat_t pixelFormat) = 0;
virtual void DrawSurface(IGpDisplayDriverSurface *surface, size_t x, size_t y, size_t width, size_t height) = 0;
virtual void DrawSurface(IGpDisplayDriverSurface *surface, int32_t x, int32_t y, size_t width, size_t height) = 0;
virtual IGpColorCursor *LoadColorCursor(int cursorID) = 0;
virtual void SetColorCursor(IGpColorCursor *colorCursor) = 0;
virtual IGpCursor *LoadCursor(bool isColor, int cursorID) = 0;
virtual void SetCursor(IGpCursor *cursor) = 0;
virtual void SetStandardCursor(EGpStandardCursor_t standardCursor) = 0;
virtual void UpdatePalette(const void *paletteData) = 0;