Engine no longer depends on WoW/Source
- MOUSEBUTTON/MOUSEMODE move to Engine/Source/Event/Types.h (WoW/Source/Console/Types.h removed; COLOR_T is in ConsoleBase/Types.h). - CRange and CBoundingBox move to Tempest (CRange.h, CBoundingBox.h); World.h includes them. - TEXTURECACHE moves to Gxu/GxuFontMiscClasses.h (its code is in the Gxu font range, 0x6C8E70+); CACHEENTRY stays in WoW/Common/TextureCache.h. - CGxDevice.h, CGxFont.h, M2Model.h, Event and Os drop their WoW includes. Build clean on Win32/x64 (known Wow.exe link gaps only); verify unchanged. Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
|
||||
#include <cstdint>
|
||||
#include "Engine/Source/Event/Types.h"
|
||||
#include "WoW/Source/Console/Types.h"
|
||||
|
||||
HEVENTCONTEXT EventCreateContextEx(int32_t interactive, EVENTHANDLERFUNC initializeHandler, EVENTHANDLERFUNC destroyHandler, uint32_t idleTime, uint32_t debugFlags);
|
||||
void EventDestroy();
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
#include "Engine/Source/Event/Types.h"
|
||||
#include "Engine/Source/Os/Input.h"
|
||||
#include "Engine/Source/Tempest/CRect.h"
|
||||
#include "WoW/Source/Console/Types.h"
|
||||
|
||||
class EvtContext;
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include "Engine/Source/Tempest/C2Vector.h"
|
||||
#include "WoW/Source/Console/Types.h"
|
||||
|
||||
enum KEY : uint32_t {
|
||||
KEY_NONE = 0xFFFFFFFFFFFFFFFF,
|
||||
@@ -120,6 +119,32 @@ enum KEY : uint32_t {
|
||||
KEY_LAST = 0x313,
|
||||
};
|
||||
|
||||
enum MOUSEBUTTON : uint32_t {
|
||||
MOUSE_BUTTON_NONE = 0,
|
||||
MOUSE_BUTTON_LEFT = 1,
|
||||
MOUSE_BUTTON_MIDDLE = 2,
|
||||
MOUSE_BUTTON_RIGHT = 4,
|
||||
MOUSE_BUTTON_XBUTTON1 = 8,
|
||||
MOUSE_BUTTON_XBUTTON2 = 16,
|
||||
MOUSE_BUTTON_XBUTTON3 = 32,
|
||||
MOUSE_BUTTON_XBUTTON4 = 64,
|
||||
MOUSE_BUTTON_XBUTTON5 = 128,
|
||||
MOUSE_BUTTON_XBUTTON6 = 0x100,
|
||||
MOUSE_BUTTON_XBUTTON7 = 0x200,
|
||||
MOUSE_BUTTON_XBUTTON8 = 0x400,
|
||||
MOUSE_BUTTON_XBUTTON9 = 0x800,
|
||||
MOUSE_BUTTON_XBUTTON10 = 0x1000,
|
||||
MOUSE_BUTTON_XBUTTON11 = 0x2000,
|
||||
MOUSE_BUTTON_XBUTTON12 = 0x4000,
|
||||
MOUSE_BUTTON_ALL = 0xFFFFFFFFFFFFFFFF,
|
||||
};
|
||||
|
||||
enum MOUSEMODE {
|
||||
MOUSE_MODE_NORMAL = 0,
|
||||
MOUSE_MODE_RELATIVE = 1,
|
||||
MOUSE_MODES = 2,
|
||||
};
|
||||
|
||||
enum SCHEDSTATE : uint32_t {
|
||||
SCHEDSTATE_ACTIVE = 0,
|
||||
SCHEDSTATE_CLOSED = 1,
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "Engine/Source/Gx/CGxTex.h"
|
||||
#include "Engine/Source/Gx/Types.h"
|
||||
#include "Engine/Source/Tempest/C2Vector.h"
|
||||
#include "Engine/Source/Tempest/CBoundingBox.h"
|
||||
#include "Engine/Source/Tempest/C2iVector.h"
|
||||
#include "Engine/Source/Tempest/C3Vector.h"
|
||||
#include "Engine/Source/Tempest/C4Vector.h"
|
||||
@@ -22,9 +23,6 @@
|
||||
#include "Engine/Source/Tempest/CImVector.h"
|
||||
#include "Engine/Source/Storm/H/stpl.h"
|
||||
#include "Engine/Source/Storm/H/Types.h"
|
||||
#include "WoW/Source/Types.h"
|
||||
#include "WoW/Source/WorldClient/Types.h"
|
||||
#include "WoW/Source/WorldClient/World.h"
|
||||
#include "Engine/Source/Tempest/CRect.h"
|
||||
#include "Engine/Source/Tempest/CiRect.h"
|
||||
#include "_Triage/EmergencyMem.h"
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
#include <windows.h>
|
||||
#include "Engine/Source/Gxu/GxuFontMiscClasses.h"
|
||||
#include "Engine/Source/Storm/H/stpl.h"
|
||||
#include "WoW/Common/TextureCache.h"
|
||||
|
||||
struct CGxString;
|
||||
struct CHARCODEDESC;
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
#include "Engine/Source/Tempest/CRect.h"
|
||||
|
||||
class CColor;
|
||||
class CGxFont;
|
||||
class CHARCODEDESC;
|
||||
struct HASHKEY_NONE;
|
||||
struct VERT;
|
||||
@@ -53,4 +54,13 @@ class TEXTURECACHEROW {
|
||||
/* 0004 */ TSList<CHARCODEDESC> m_glyphlist;
|
||||
};
|
||||
|
||||
class TEXTURECACHE {
|
||||
public:
|
||||
/* 0000 */ uint32_t m_texture;
|
||||
/* 0004 */ CGxFont* m_theFace;
|
||||
/* 0008 */ int8_t m_anyDirtyGlyphs;
|
||||
/* 0009 */ int8_t m_pad [3];
|
||||
/* 000C */ TSBaseArray<TEXTURECACHEROW> m_textureRows;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "Engine/Source/Tempest/C44Matrix.h"
|
||||
#include "Engine/Source/Tempest/C4Quaternion.h"
|
||||
#include "Engine/Source/Tempest/CAaBox.h"
|
||||
#include "WoW/Source/WorldClient/World.h"
|
||||
#include "Engine/Source/Tempest/CRange.h"
|
||||
|
||||
struct C3Vector;
|
||||
struct C44Matrix;
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
|
||||
#include <cstdint>
|
||||
#include "Engine/Source/Event/Types.h"
|
||||
#include "WoW/Source/Console/Types.h"
|
||||
|
||||
struct tagRECT;
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#include "Engine/Source/Os/TimeManager.h"
|
||||
#include "Engine/Source/Storm/H/storm.h"
|
||||
#include "Engine/Source/Tempest/C2iVector.h"
|
||||
#include "WoW/Source/Console/Types.h"
|
||||
|
||||
#define WM_POPUPSYSTEMMENU 0x313
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#include "Engine/Source/Os/TimeManager.h"
|
||||
#include "Engine/Source/Storm/H/storm.h"
|
||||
#include "Engine/Source/Tempest/C2iVector.h"
|
||||
#include "WoW/Source/Console/Types.h"
|
||||
|
||||
#define WM_POPUPSYSTEMMENU 0x313
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
#ifndef ENGINE_SOURCE_TEMPEST_CBOUNDINGBOX_H
|
||||
#define ENGINE_SOURCE_TEMPEST_CBOUNDINGBOX_H
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include "Engine/Source/Tempest/CRange.h"
|
||||
|
||||
class CBoundingBox {
|
||||
public:
|
||||
/* 0000 */ CRange m_x;
|
||||
/* 0008 */ CRange m_y;
|
||||
/* 0010 */ CRange m_z;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,13 @@
|
||||
#ifndef ENGINE_SOURCE_TEMPEST_CRANGE_H
|
||||
#define ENGINE_SOURCE_TEMPEST_CRANGE_H
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
|
||||
class CRange {
|
||||
public:
|
||||
/* 0000 */ float m_l;
|
||||
/* 0004 */ float m_h;
|
||||
};
|
||||
|
||||
#endif
|
||||
@@ -10,9 +10,7 @@
|
||||
|
||||
class CACHEENTRY;
|
||||
class CAsyncObject;
|
||||
class CGxFont;
|
||||
struct HASHKEY_NONE;
|
||||
class TEXTURECACHEROW;
|
||||
|
||||
class CACHEENTRY : public TSHashObject<CACHEENTRY, HASHKEY_NONE> {
|
||||
public:
|
||||
@@ -25,13 +23,4 @@ class CACHEENTRY : public TSHashObject<CACHEENTRY, HASHKEY_NONE> {
|
||||
/* 00B0 */ uint32_t m_flags;
|
||||
};
|
||||
|
||||
class TEXTURECACHE {
|
||||
public:
|
||||
/* 0000 */ uint32_t m_texture;
|
||||
/* 0004 */ CGxFont* m_theFace;
|
||||
/* 0008 */ int8_t m_anyDirtyGlyphs;
|
||||
/* 0009 */ int8_t m_pad [3];
|
||||
/* 000C */ TSBaseArray<TEXTURECACHEROW> m_textureRows;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include "Engine/Source/ConsoleBase/Types.h"
|
||||
#include "Engine/Source/Event/Types.h"
|
||||
#include "Engine/Source/Storm/H/stpl.h"
|
||||
#include "WoW/Source/Console/Types.h"
|
||||
|
||||
class CGxString;
|
||||
class CONSOLELINE;
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <windows.h>
|
||||
#include "Engine/Source/Event/Types.h"
|
||||
#include "Engine/Source/Tempest/C3Vector.h"
|
||||
#include "WoW/Source/Console/Types.h"
|
||||
#include "WoW/Source/Object/WGUID.h"
|
||||
|
||||
class CGGameUI;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "Engine/Source/Tempest/C3Vector.h"
|
||||
#include "Engine/Source/Tempest/C44Matrix.h"
|
||||
#include "Engine/Source/Storm/H/stpl.h"
|
||||
#include "WoW/Source/Console/Types.h"
|
||||
#include "Engine/Source/Event/Types.h"
|
||||
#include "WoW/Source/Object/WGUID.h"
|
||||
#include "Engine/Source/Tempest/CRect.h"
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include "Engine/Source/Tempest/CBoundingBox.h"
|
||||
#include "Engine/Source/Tempest/C3Vector.h"
|
||||
#include "Engine/Source/Event/Types.h"
|
||||
#include "Engine/Source/Storm/H/stpl.h"
|
||||
@@ -13,19 +14,6 @@ class CMapChunk;
|
||||
class CMapDoodadDef;
|
||||
class CMapDoodadDefMapChunkLink;
|
||||
|
||||
class CRange {
|
||||
public:
|
||||
/* 0000 */ float m_l;
|
||||
/* 0004 */ float m_h;
|
||||
};
|
||||
|
||||
class CBoundingBox {
|
||||
public:
|
||||
/* 0000 */ CRange m_x;
|
||||
/* 0008 */ CRange m_y;
|
||||
/* 0010 */ CRange m_z;
|
||||
};
|
||||
|
||||
class CMapDoodadDefMapChunkLink {
|
||||
public:
|
||||
/* 0000 */ uint32_t m_objectIndex;
|
||||
|
||||
Reference in New Issue
Block a user