Merge 8935c520c0 into 87ae3b512b

src/app/CMakeLists.txt

@@ -32,6 +32,8 @@ if(WHOA_SYSTEM_MAC)
             "-framework AppKit"
             "-framework Carbon"
             "-framework IOKit"
+            "-framework Metal"
+            "-framework QuartzCore"
     )
 
     install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/mac/MainMenu.nib DESTINATION "bin")

src/app/mac/EngineMTLLayerView.h

@@ -0,0 +1,9 @@
+#ifndef APP_MAC_ENGINE_MTL_LAYER_VIEW_H
+#define APP_MAC_ENGINE_MTL_LAYER_VIEW_H
+
+#include "app/mac/EngineGLLayerView.h"
+
+@interface EngineMTLLayerView : EngineGLLayerView
+@end
+
+#endif

src/app/mac/EngineMTLLayerView.mm

@@ -0,0 +1,36 @@
+#include "app/mac/EngineMTLLayerView.h"
+#import <QuartzCore/CAMetalLayer.h>
+
+@implementation EngineMTLLayerView
+
+- (CALayer*)makeBackingLayer {
+    return [CAMetalLayer layer];
+}
+
+- (id)initWithFrame:(NSRect)frame glWindow:(GLWindow*)window {
+    self = [super initWithFrame:frame glWindow:window];
+
+    if (self) {
+        [self setWantsLayer:YES];
+    }
+
+    return self;
+}
+
+- (void)drawRect:(NSRect)dirtyRect {
+    // Rendering is driven by CGxDeviceMTL.
+}
+
+- (void)update {
+    [super update];
+
+    if (![self.layer isKindOfClass:[CAMetalLayer class]]) {
+        return;
+    }
+
+    CAMetalLayer* layer = (CAMetalLayer*)self.layer;
+    CGSize size = [self convertSizeToBacking:self.bounds.size];
+    layer.drawableSize = size;
+}
+
+@end

src/app/mac/View.mm

@@ -1,7 +1,9 @@
 #include "app/mac/View.h"
 #include "app/mac/EngineGLLayerView.h"
+#include "app/mac/EngineMTLLayerView.h"
 #include "app/mac/WindowCallbacks.h"
 #include "gx/gll/GLWindow.h"
+#include "gx/Device.hpp"
 
 GLWindowCallbacks EngineViewCallbacks = {
     &MacOnResized,
@@ -23,5 +25,9 @@ void AssignEngineViewCallbacks(GLWindowCallbacks* callbacks) {
 }
 
 Class GetEngineViewClass() {
+    if (GxDevApi() == GxApi_Metal) {
+        return [EngineMTLLayerView class];
+    }
+
     return [EngineGLLayerView class];
 }

src/app/mac/WindowCallbacks.mm

@@ -2,6 +2,7 @@
 #include "app/mac/MacClient.h"
 #include "event/Input.hpp"
 #include "gx/gll/CGxDeviceGLL.hpp"
+#include "gx/mtl/CGxDeviceMTL.hpp"
 #include "gx/Device.hpp"
 #include "gx/Window.hpp"
 #include <bc/Debug.hpp>
@@ -171,7 +172,11 @@ void MacOnResized(int32_t width, int32_t height, bool a3) {
         return;
     }
 
+    if (GxDevApi() == GxApi_GLL) {
         static_cast<CGxDeviceGLL*>(g_theGxDevicePtr)->Resize(width, height);
+    } else if (GxDevApi() == GxApi_Metal) {
+        static_cast<CGxDeviceMTL*>(g_theGxDevicePtr)->Resize(width, height);
+    }
 
     OsQueuePut(OS_INPUT_SIZE, width, height, 0, 0);
 

src/console/Device.cpp

@@ -6,6 +6,7 @@
 #include "gx/Adapter.hpp"
 #include "gx/Device.hpp"
 #include <storm/Array.hpp>
+#include <cstdlib>
 #include <cstring>
 
 static CGxDevice* s_device;
@@ -417,6 +418,13 @@ void ConsoleDeviceInitialize(const char* title) {
     api = GxApi_GLL;
 #endif
 
+#if defined(WHOA_SYSTEM_MAC)
+    const char* apiOverride = getenv("WHOA_GX_API");
+    if (apiOverride && !strcmp(apiOverride, "metal")) {
+        api = GxApi_Metal;
+    }
+#endif
+
     s_device = GxDevCreate(api, OsWindowProc, format);
 
     // TODO

src/gx/CGxDevice.cpp

@@ -18,6 +18,7 @@
 
 #if defined(WHOA_SYSTEM_MAC)
     #include "gx/gll/CGxDeviceGLL.hpp"
+    #include "gx/mtl/CGxDeviceMTL.hpp"
     #include "gx/mac/Display.hpp"
     #include <ApplicationServices/ApplicationServices.h>
     #include <OpenGL/OpenGL.h>
@@ -117,6 +118,8 @@ int32_t CGxDevice::AdapterFormats(EGxApi api, TSGrowableArray<CGxFormat>& adapte
         CGxDevice::OpenGlAdapterFormats(adapterFormats);
     } else if (api == GxApi_GLL) {
         CGxDevice::GLLAdapterFormats(adapterFormats);
+    } else if (api == GxApi_Metal) {
+        CGxDevice::OpenGlAdapterFormats(adapterFormats);
     }
 
 #elif defined(WHOA_SYSTEM_LINUX)
@@ -228,6 +231,11 @@ CGxDevice* CGxDevice::NewGLL() {
     auto m = SMemAlloc(sizeof(CGxDeviceGLL), __FILE__, __LINE__, 0x0);
     return new (m) CGxDeviceGLL();
 }
+
+CGxDevice* CGxDevice::NewMTL() {
+    auto m = SMemAlloc(sizeof(CGxDeviceMTL), __FILE__, __LINE__, 0x0);
+    return new (m) CGxDeviceMTL();
+}
 #endif
 
 CGxDevice* CGxDevice::NewOpenGl() {

src/gx/CGxDevice.hpp

@@ -70,6 +70,7 @@ class CGxDevice {
 #endif
 #if defined(WHOA_SYSTEM_MAC)
         static CGxDevice* NewGLL();
+        static CGxDevice* NewMTL();
 #endif
         static CGxDevice* NewOpenGl();
         static void OpenGlAdapterFormats(TSGrowableArray<CGxFormat>& adapterFormats);

src/gx/CMakeLists.txt

@@ -20,6 +20,7 @@ if(WHOA_SYSTEM_MAC)
     file(GLOB MAC_SOURCES
         "gll/*.cpp"
         "gll/*.mm"
+        "mtl/*.mm"
         "mac/*.cpp"
     )
 

src/gx/Device.cpp

@@ -24,6 +24,8 @@ CGxDevice* GxDevCreate(EGxApi api, int32_t (*windowProc)(void* window, uint32_t
             device = CGxDevice::NewOpenGl();
         } else if (api == GxApi_GLL) {
             device = CGxDevice::NewGLL();
+        } else if (api == GxApi_Metal) {
+            device = CGxDevice::NewMTL();
         } else {
             // Error
         }

src/gx/Types.hpp

@@ -35,7 +35,8 @@ enum EGxApi {
     GxApi_D3d10 = 3,
     GxApi_D3d11 = 4,
     GxApi_GLL = 5,
-    GxApis_Last = 6
+    GxApi_Metal = 6,
+    GxApis_Last = 7
 };
 
 enum EGxBlend {

src/gx/mtl/CGxDeviceMTL.hpp

@@ -0,0 +1,81 @@
+#ifndef GX_MTL_C_GX_DEVICE_MTL_HPP
+#define GX_MTL_C_GX_DEVICE_MTL_HPP
+
+#include "gx/CGxDevice.hpp"
+#include "gx/gll/GLWindow.h"
+
+class CGxBatch;
+class CGxShader;
+
+class CGxDeviceMTL : public CGxDevice {
+    public:
+        // Member variables
+        GLWindow m_window;
+
+        // Virtual member functions
+        void ITexMarkAsUpdated(CGxTex*) override;
+        void IRsSendToHw(EGxRenderState) override;
+        int32_t DeviceCreate(int32_t (*windowProc)(void* window, uint32_t message, uintptr_t wparam, intptr_t lparam), const CGxFormat&) override;
+        int32_t DeviceSetFormat(const CGxFormat&) override;
+        void* DeviceWindow() override;
+        void DeviceWM(EGxWM wm, uintptr_t param1, uintptr_t param2) override {};
+        void CapsWindowSize(CRect&) override;
+        void CapsWindowSizeInScreenCoords(CRect& dst) override;
+        void ScenePresent() override;
+        void SceneClear(uint32_t, CImVector) override;
+        void Draw(CGxBatch* batch, int32_t indexed) override;
+        void PoolSizeSet(CGxPool*, uint32_t) override;
+        char* BufLock(CGxBuf*) override;
+        int32_t BufUnlock(CGxBuf*, uint32_t) override;
+        void BufData(CGxBuf* buf, const void* data, size_t size, uintptr_t offset) override;
+        void TexDestroy(CGxTex* texId) override;
+        void IShaderCreate(CGxShader*) override;
+        void ShaderCreate(CGxShader*[], EGxShTarget, const char*, const char*, int32_t) override;
+        int32_t StereoEnabled(void) override;
+        void XformSetProjection(const C44Matrix& matrix) override;
+
+        // Member functions
+        CGxDeviceMTL();
+        void Resize(uint32_t width, uint32_t height);
+
+    private:
+        void ISetCaps(const CGxFormat& format);
+        void EnsureLibrary();
+        void BeginFrame();
+        void* GetPipeline(EGxVertexBufferFormat format, bool useColor, bool useSkin, bool useTex, int32_t blendMode);
+        void* GetPoolBuffer(CGxPool* pool);
+        void ITexCreate(CGxTex* texId);
+        void ITexUpload(CGxTex* texId);
+        void* GetTexture(CGxTex* texId);
+        void* GetSampler(CGxTex* texId);
+        void EnsureFallbackTexture();
+        void EnsureDepthTexture(uint32_t width, uint32_t height);
+        void* GetDepthState(bool depthTest, bool depthWrite, uint32_t depthFunc);
+        void* m_device = nullptr;
+        void* m_commandQueue = nullptr;
+        void* m_layer = nullptr;
+        void* m_shaderLibrary = nullptr;
+        void* m_pipelineColor[GxVertexBufferFormats_Last][GxBlends_Last] = {};
+        void* m_pipelineSolid[GxVertexBufferFormats_Last][GxBlends_Last] = {};
+        void* m_pipelineSkin[GxVertexBufferFormats_Last][GxBlends_Last] = {};
+        void* m_pipelineColorTex[GxVertexBufferFormats_Last][GxBlends_Last] = {};
+        void* m_pipelineSolidTex[GxVertexBufferFormats_Last][GxBlends_Last] = {};
+        void* m_pipelineSkinTex[GxVertexBufferFormats_Last][GxBlends_Last] = {};
+        void* m_pipelineColorTex2[GxVertexBufferFormats_Last][GxBlends_Last] = {};
+        void* m_pipelineSolidTex2[GxVertexBufferFormats_Last][GxBlends_Last] = {};
+        void* m_pipelineSkinTex2[GxVertexBufferFormats_Last][GxBlends_Last] = {};
+        void* m_frameCommandBuffer = nullptr;
+        void* m_frameEncoder = nullptr;
+        void* m_frameDrawable = nullptr;
+        uint32_t m_frameHasDraw = 0;
+        uint32_t m_clearMask = 0;
+        uint32_t m_clearColor = 0;
+        void* m_fallbackTexture = nullptr;
+        void* m_fallbackSampler = nullptr;
+        void* m_depthTexture = nullptr;
+        uint32_t m_depthWidth = 0;
+        uint32_t m_depthHeight = 0;
+        void* m_depthStates[2][2][4] = {};
+};
+
+#endif

src/object/Client.hpp

@@ -1,6 +1,7 @@
 #ifndef OBJECT_CLIENT_HPP
 #define OBJECT_CLIENT_HPP
 
+#include "client/CGPlayer_C.hpp"
 #include "client/ObjMgr.hpp"
 #include "object/Types.hpp"
 

src/object/client/CGContainer.cpp

@@ -24,3 +24,7 @@ uint32_t CGContainer::TotalFields() {
 uint32_t CGContainer::TotalFieldsSaved() {
     return CGContainer::GetBaseOffsetSaved() + 72;
 }
+
+CGContainerData* CGContainer::Container() const {
+    return this->m_cont;
+}

src/object/client/CGContainer.hpp

@@ -20,9 +20,13 @@ class CGContainer {
         static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 
-        // Public member variables
+    protected:
+        // Protected member variables
         CGContainerData* m_cont;
         uint32_t* m_contSaved;
+
+        // Protected member functions
+        CGContainerData* Container() const;
 };
 
 #endif

src/object/client/CGCorpse.cpp

@@ -24,3 +24,7 @@ uint32_t CGCorpse::TotalFields() {
 uint32_t CGCorpse::TotalFieldsSaved() {
     return CGCorpse::GetBaseOffsetSaved() + 3;
 }
+
+CGCorpseData* CGCorpse::Corpse() const {
+    return this->m_corpse;
+}

src/object/client/CGCorpse.hpp

@@ -17,9 +17,13 @@ class CGCorpse {
         static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 
-        // Public member variables
+    protected:
+        // Protected member variables
         CGCorpseData* m_corpse;
         uint32_t* m_corpseSaved;
+
+        // Protected member functions
+        CGCorpseData* Corpse() const;
 };
 
 #endif

src/object/client/CGDynamicObject.cpp

@@ -24,3 +24,7 @@ uint32_t CGDynamicObject::TotalFields() {
 uint32_t CGDynamicObject::TotalFieldsSaved() {
     return CGDynamicObject::GetBaseOffsetSaved() + 0;
 }
+
+CGDynamicObjectData* CGDynamicObject::DynamicObject() const {
+    return this->m_dynamicObj;
+}

src/object/client/CGDynamicObject.hpp

@@ -17,9 +17,13 @@ class CGDynamicObject {
         static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 
-        // Public member variables
+    protected:
+        // Protected member variables
         CGDynamicObjectData* m_dynamicObj;
         uint32_t* m_dynamicObjSaved;
+
+        // Protected member functions
+        CGDynamicObjectData* DynamicObject() const;
 };
 
 #endif

src/object/client/CGGameObject.cpp

@@ -24,3 +24,7 @@ uint32_t CGGameObject::TotalFields() {
 uint32_t CGGameObject::TotalFieldsSaved() {
     return CGGameObject::GetBaseOffsetSaved() + 4;
 }
+
+CGGameObjectData* CGGameObject::GameObject() const {
+    return this->m_gameObj;
+}

src/object/client/CGGameObject.hpp

@@ -17,9 +17,13 @@ class CGGameObject {
         static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 
-        // Public member variables
+    protected:
+        // Protected member variables
         CGGameObjectData* m_gameObj;
         uint32_t* m_gameObjSaved;
+
+        // Protected member functions
+        CGGameObjectData* GameObject() const;
 };
 
 #endif

src/object/client/CGItem.cpp

@@ -24,3 +24,7 @@ uint32_t CGItem::TotalFields() {
 uint32_t CGItem::TotalFieldsSaved() {
     return CGItem::GetBaseOffsetSaved() + 47;
 }
+
+CGItemData* CGItem::Item() const {
+    return this->m_item;
+}

src/object/client/CGItem.hpp

@@ -38,9 +38,13 @@ class CGItem {
         static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 
-        // Public member variables
+    protected:
+        // Protected member variables
         CGItemData* m_item;
         uint32_t* m_itemSaved;
+
+        // Protected member functions
+        CGItemData* Item() const;
 };
 
 #endif

src/object/client/CGObject.cpp

@@ -23,3 +23,19 @@ uint32_t CGObject::TotalFields() {
 uint32_t CGObject::TotalFieldsSaved() {
     return CGObject::GetBaseOffsetSaved() + 3;
 }
+
+WOWGUID CGObject::GetGUID() const {
+    return this->m_obj->m_guid;
+}
+
+OBJECT_TYPE CGObject::GetType() const {
+    return this->m_obj->m_type;
+}
+
+OBJECT_TYPE_ID CGObject::GetTypeID() const {
+    return this->m_typeID;
+}
+
+CGObjectData* CGObject::Obj() const {
+    return this->m_obj;
+}

src/object/client/CGObject.hpp

@@ -25,10 +25,21 @@ class CGObject {
 
         // Public member variables
         uint32_t uint0; // TODO what is this?
+        uint32_t m_memHandle;
+
+        // Public member functions
+        WOWGUID GetGUID() const;
+        OBJECT_TYPE GetType() const;
+        OBJECT_TYPE_ID GetTypeID() const;
+
+    protected:
+        // Protected member variables
         CGObjectData* m_obj;
         uint32_t* m_objSaved;
-        uint32_t m_memHandle;
         OBJECT_TYPE_ID m_typeID;
+
+        // Protected member functions
+        CGObjectData* Obj() const;
 };
 
 #endif

src/object/client/CGObject_C.cpp

@@ -5,6 +5,10 @@
 CGObject_C::CGObject_C(uint32_t time, CClientObjCreate& objCreate) {
     // TODO
 
+    this->m_model = nullptr;
+
+    // TODO
+
     this->m_lockCount = 0;
     this->m_disabled = false;
     this->m_inReenable = false;

src/object/client/CGObject_C.hpp

@@ -8,12 +8,16 @@
 #include <storm/Hash.hpp>
 #include <storm/List.hpp>
 
+class CM2Model;
+
 class CGObject_C : public CGObject, public TSHashObject<CGObject_C, CHashKeyGUID> {
     public:
         // Public member variables
         TSLink<CGObject_C> m_link;
         uint32_t m_disableTimeMs;
         // TODO
+        CM2Model* m_model;
+        // TODO
         uint32_t m_lockCount        : 16;
         uint32_t m_disabled         : 1;
         uint32_t m_inReenable       : 1;

src/object/client/CGPlayer.cpp

@@ -40,3 +40,7 @@ uint32_t CGPlayer::TotalFieldsSaved() {
 uint32_t CGPlayer::TotalRemoteFieldsSaved() {
     return CGPlayer::GetBaseOffsetSaved() + 173;
 }
+
+CGPlayerData* CGPlayer::Player() const {
+    return this->m_player;
+}

src/object/client/CGPlayer.hpp

@@ -148,9 +148,13 @@ class CGPlayer {
         static uint32_t TotalFieldsSaved();
         static uint32_t TotalRemoteFieldsSaved();
 
-        // Public member variables
+    protected:
+        // Protected member variables
         CGPlayerData* m_player;
         uint32_t* m_playerSaved;
+
+        // Protected member functions
+        CGPlayerData* Player() const;
 };
 
 #endif

src/object/client/CGUnit.cpp

@@ -24,3 +24,7 @@ uint32_t CGUnit::TotalFields() {
 uint32_t CGUnit::TotalFieldsSaved() {
     return CGUnit::GetBaseOffsetSaved() + 123;
 }
+
+CGUnitData* CGUnit::Unit() const {
+    return this->m_unit;
+}

src/object/client/CGUnit.hpp

@@ -82,9 +82,13 @@ class CGUnit {
         static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 
-        // Public member variables
+    protected:
+        // Protected member variables
         CGUnitData* m_unit;
         uint32_t* m_unitSaved;
+
+        // Protected member functions
+        CGUnitData* Unit() const;
 };
 
 #endif

src/object/client/MessageHandlers.cpp

@@ -61,7 +61,7 @@ int32_t PostInitObject(CDataStore* msg, uint32_t time, bool a3) {
         return 0;
     }
 
-    if (object->m_inReenable && object->m_obj->m_type & TYPE_UNIT) {
+    if (object->m_inReenable && object->GetType() & TYPE_UNIT) {
         // TODO
     }
 
@@ -139,7 +139,7 @@ void PostMovementUpdate(CDataStore* msg) {
         return;
     }
 
-    unit->PostMovementUpdate(move, unit->m_obj->m_guid == CGUnit_C::s_activeMover);
+    unit->PostMovementUpdate(move, unit->GetGUID() == CGUnit_C::s_activeMover);
 
     if (reenable) {
         unit->Reenable();
@@ -201,7 +201,7 @@ int32_t UpdateObject(CDataStore* msg) {
     auto object = GetUpdateObject(guid, &reenable);
 
     if (object) {
-        if (!FillInPartialObjectData(object, object->m_obj->m_guid, msg, false, false)) {
+        if (!FillInPartialObjectData(object, object->GetGUID(), msg, false, false)) {
             return 0;
         }
 
@@ -329,7 +329,7 @@ int32_t CreateObject(CDataStore* msg, uint32_t time) {
     if (existingObject) {
         CClientObjCreate::Skip(msg);
 
-        if (!FillInPartialObjectData(existingObject, existingObject->m_obj->m_guid, msg, false, true)) {
+        if (!FillInPartialObjectData(existingObject, existingObject->GetGUID(), msg, false, true)) {
             return 0;
         }
 

src/object/client/Mirror.cpp

@@ -91,7 +91,7 @@ uint32_t GetNumDwordBlocks(OBJECT_TYPE type, WOWGUID guid) {
  * to indicate the end of the hierarchy.
  */
 OBJECT_TYPE_ID IncTypeID(CGObject_C* object, OBJECT_TYPE_ID curTypeID) {
-    switch (object->m_obj->m_type) {
+    switch (object->GetType()) {
         // ID_OBJECT -> ID_ITEM -> ID_CONTAINER
         case HIER_TYPE_ITEM:
         case HIER_TYPE_CONTAINER:
@@ -173,7 +173,7 @@ int32_t CallMirrorHandlers(CDataStore* msg, bool a2, WOWGUID guid) {
 
     OBJECT_TYPE_ID typeID = ID_OBJECT;
     uint32_t blockOffset = 0;
-    uint32_t numBlocks = GetNumDwordBlocks(object->m_obj->m_type, guid);
+    uint32_t numBlocks = GetNumDwordBlocks(object->GetType(), guid);
 
     for (int32_t block = 0; block < numBlocks; block++) {
         if (block >= s_objMirrorBlocks[typeID]) {
@@ -203,7 +203,7 @@ int32_t FillInPartialObjectData(CGObject_C* object, WOWGUID guid, CDataStore* ms
 
     OBJECT_TYPE_ID typeID = ID_OBJECT;
     uint32_t blockOffset = 0;
-    uint32_t numBlocks = GetNumDwordBlocks(object->m_obj->m_type, guid);
+    uint32_t numBlocks = GetNumDwordBlocks(object->GetType(), guid);
 
     for (int32_t block = 0; block < numBlocks; block++) {
         if (block >= s_objMirrorBlocks[typeID]) {

src/object/client/ObjMgr.cpp

@@ -93,9 +93,9 @@ CGObject_C* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid) {
 
 void ClntObjMgrFreeObject(CGObject_C* object) {
     auto playerGUID = ClntObjMgrGetActivePlayer();
-    auto isActivePlayer = object->m_obj->m_guid == playerGUID;
+    auto isActivePlayer = object->GetGUID() == playerGUID;
 
-    switch (object->m_obj->m_type) {
+    switch (object->GetType()) {
         case TYPE_OBJECT:
         case HIER_TYPE_ITEM:
         case HIER_TYPE_CONTAINER:
@@ -117,7 +117,7 @@ void ClntObjMgrFreeObject(CGObject_C* object) {
     if (isActivePlayer) {
         STORM_FREE(object);
     } else {
-        ObjectFree(s_objHeapId[object->m_typeID], object->m_memHandle);
+        ObjectFree(s_objHeapId[object->GetTypeID()], object->m_memHandle);
     }
 }
 
@@ -171,8 +171,8 @@ void ClntObjMgrInitializeStd(uint32_t mapID) {
 }
 
 void ClntObjMgrLinkInNewObject(CGObject_C* object) {
-    CHashKeyGUID key(object->m_obj->m_guid);
-    s_curMgr->m_objects.Insert(object, object->m_obj->m_guid, key);
+    CHashKeyGUID key(object->GetGUID());
+    s_curMgr->m_objects.Insert(object, object->GetGUID(), key);
 }
 
 CGObject_C* ClntObjMgrObjectPtr(WOWGUID guid, OBJECT_TYPE type, const char* fileName, int32_t lineNumber) {
@@ -186,7 +186,7 @@ CGObject_C* ClntObjMgrObjectPtr(WOWGUID guid, OBJECT_TYPE type, const char* file
         return nullptr;
     }
 
-    if (!(object->m_obj->m_type & type)) {
+    if (!(object->GetType() & type)) {
         return nullptr;
     }
 

src/object/client/Util.cpp

@@ -107,11 +107,11 @@ void HandleObjectOutOfRangePass2(CGObject_C* object) {
     }
 
     ClntObjMgrGetCurrent()->m_lazyCleanupObjects.Insert(object, object->m_hashval, CHashKeyGUID(object->m_key));
-    ClntObjMgrGetCurrent()->m_lazyCleanupFifo[object->m_typeID - 1].LinkToTail(object);
+    ClntObjMgrGetCurrent()->m_lazyCleanupFifo[object->GetTypeID() - 1].LinkToTail(object);
 }
 
 void InitObject(CGObject_C* object, uint32_t time, CClientObjCreate& objCreate) {
-    switch (object->m_typeID) {
+    switch (object->GetTypeID()) {
         case ID_ITEM: {
             new (object) CGItem_C(time, objCreate);
 

src/ui/Types.hpp

@@ -98,6 +98,21 @@ enum TextureImageMode {
     ImageMode_Desaturate    = 1
 };
 
+enum TOOLTIP_ANCHORPOINT {
+    TOOLTIP_ANCHOR_LEFT         = 0,
+    TOOLTIP_ANCHOR_RIGHT        = 1,
+    TOOLTIP_ANCHOR_BOTTOMLEFT   = 2,
+    TOOLTIP_ANCHOR_BOTTOM       = 3,
+    TOOLTIP_ANCHOR_BOTTOMRIGHT  = 4,
+    TOOLTIP_ANCHOR_TOPLEFT      = 5,
+    TOOLTIP_ANCHOR_TOP          = 6,
+    TOOLTIP_ANCHOR_TOPRIGHT     = 7,
+    TOOLTIP_ANCHOR_CURSOR       = 8,
+    TOOLTIP_ANCHOR_NONE         = 9,
+    TOOLTIP_ANCHOR_PRESERVE     = 10,
+    TOOLTIP_ANCHOR_CURSOR_RIGHT = 11,
+};
+
 struct FRAMEPRIORITY {
     CSimpleFrame* frame;
     uint32_t priority;

src/ui/game/BattlefieldInfoScript.cpp

@@ -1,4 +1,5 @@
 #include "ui/game/BattlefieldInfoScript.hpp"
+#include "ui/game/CGBattlefieldInfo.hpp"
 #include "ui/FrameScript.hpp"
 #include "util/Unimplemented.hpp"
 
@@ -105,7 +106,9 @@ int32_t Script_GetBattlefieldStatData(lua_State* L) {
 }
 
 int32_t Script_RequestBattlefieldPositions(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
+    CGBattlefieldInfo::RequestPlayerPositions();
+
+    return 0;
 }
 
 int32_t Script_GetNumBattlefieldPositions(lua_State* L) {

src/ui/game/CGBattlefieldInfo.cpp

@@ -0,0 +1,5 @@
+#include "ui/game/CGBattlefieldInfo.hpp"
+
+void CGBattlefieldInfo::RequestPlayerPositions() {
+    // TODO
+}

src/ui/game/CGBattlefieldInfo.hpp

@@ -0,0 +1,10 @@
+#ifndef UI_GAME_C_G_BATTLEFIELD_INFO_HPP
+#define UI_GAME_C_G_BATTLEFIELD_INFO_HPP
+
+class CGBattlefieldInfo {
+    public:
+        // Static functions
+        static void RequestPlayerPositions();
+};
+
+#endif

src/ui/game/CGGameUI.cpp

@@ -21,7 +21,9 @@
 #include "util/CStatus.hpp"
 #include <common/MD5.hpp>
 
+WOWGUID CGGameUI::s_currentObjectTrack;
 CScriptObject* CGGameUI::s_gameTooltip;
+WOWGUID CGGameUI::s_lockedTarget;
 CSimpleTop* CGGameUI::s_simpleTop;
 
 void LoadScriptFunctions() {
@@ -57,6 +59,14 @@ void LoadScriptFunctions() {
     // TODO
 }
 
+WOWGUID& CGGameUI::GetCurrentObjectTrack() {
+    return CGGameUI::s_currentObjectTrack;
+}
+
+WOWGUID& CGGameUI::GetLockedTarget() {
+    return CGGameUI::s_lockedTarget;
+}
+
 void CGGameUI::Initialize() {
     // TODO
 
@@ -131,7 +141,7 @@ void CGGameUI::Initialize() {
     // TODO
 
     CGGameUI::s_gameTooltip = CScriptObject::GetScriptObjectByName("GameTooltip", CGTooltip::GetObjectType());
-    // TODO STORM_ASSERT(CGGameUI::s_gameTooltip);
+    STORM_ASSERT(CGGameUI::s_gameTooltip);
 
     // TODO
 }
@@ -144,6 +154,18 @@ void CGGameUI::InitializeGame() {
     // TODO
 }
 
+int32_t CGGameUI::IsRaidMember(const WOWGUID& guid) {
+    // TODO
+
+    return false;
+}
+
+int32_t CGGameUI::IsRaidMemberOrPet(const WOWGUID& guid) {
+    // TODO
+
+    return false;
+}
+
 void CGGameUI::RegisterFrameFactories() {
     FrameXML_RegisterFactory("WorldFrame", &CGWorldFrame::Create, true);
     FrameXML_RegisterFactory("GameTooltip", &CGTooltip::Create, false);

src/ui/game/CGGameUI.hpp

@@ -1,6 +1,8 @@
 #ifndef UI_GAME_C_G_GAME_UI_HPP
 #define UI_GAME_C_G_GAME_UI_HPP
 
+#include "util/guid/Types.hpp"
+
 class CScriptObject;
 class CSimpleTop;
 
@@ -11,9 +13,17 @@ class CGGameUI {
         static CSimpleTop* s_simpleTop;
 
         // Static functions
+        static WOWGUID& GetCurrentObjectTrack();
+        static WOWGUID& GetLockedTarget();
         static void Initialize();
         static void InitializeGame();
+        static int32_t IsRaidMember(const WOWGUID& guid);
+        static int32_t IsRaidMemberOrPet(const WOWGUID& guid);
         static void RegisterFrameFactories();
+
+    private:
+        static WOWGUID s_currentObjectTrack;
+        static WOWGUID s_lockedTarget;
 };
 
 #endif

src/ui/game/CGTooltip.cpp

@@ -35,3 +35,10 @@ CGTooltip::CGTooltip(CSimpleFrame* parent) : CSimpleFrame(parent) {
 int32_t CGTooltip::GetScriptMetaTable() {
     return CGTooltip::s_metatable;
 }
+
+bool CGTooltip::IsA(int32_t type) {
+    return type == CGTooltip::s_objectType
+        || type == CSimpleFrame::s_objectType
+        || type == CScriptRegion::s_objectType
+        || type == CScriptObject::s_objectType;
+}

src/ui/game/CGTooltip.hpp

@@ -16,9 +16,14 @@ class CGTooltip : public CSimpleFrame {
         static void RegisterScriptMethods(lua_State* L);
 
         // Member variables
+        CSimpleFrame* m_owner = nullptr;
+        TOOLTIP_ANCHORPOINT m_anchorPoint;
+        // TODO
+        C2Vector m_offset;
         // TODO
 
         // Virtual member functions
+        virtual bool IsA(int32_t type);
         virtual int32_t GetScriptMetaTable();
 
         // Member functions

src/ui/game/CGTooltipScript.cpp

@@ -1,5 +1,7 @@
 #include "ui/game/CGTooltipScript.hpp"
+#include "ui/game/CGTooltip.hpp"
 #include "ui/FrameScript.hpp"
+#include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 
 namespace {
@@ -25,7 +27,35 @@ int32_t CGTooltip_GetPadding(lua_State* L) {
 }
 
 int32_t CGTooltip_IsOwned(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
+    auto type = CGTooltip::GetObjectType();
+    auto tooltip = static_cast<CGTooltip*>(FrameScript_GetObjectThis(L, type));
+
+    if (lua_type(L, 2) != LUA_TTABLE) {
+        luaL_error(L, "Usage: %s:IsOwned(frame)", tooltip->GetDisplayName());
+        return 0;
+    }
+
+    lua_rawgeti(L, 2, 0);
+    auto frame = static_cast<CSimpleFrame*>(lua_touserdata(L, -1));
+    lua_settop(L, -2);
+
+    if (!frame) {
+        luaL_error(L, "%s:IsOwned(): Couldn't find 'this' in frame object", tooltip->GetDisplayName());
+        return 0;
+    }
+
+    if (!frame->IsA(CSimpleFrame::GetObjectType())) {
+        luaL_error(L, "%s:IsOwned(): Wrong object type, expected frame", tooltip->GetDisplayName());
+        return 0;
+    }
+
+    if (tooltip->m_owner == frame) {
+        lua_pushnumber(L, 1.0);
+    } else {
+        lua_pushnil(L);
+    }
+
+    return 1;
 }
 
 int32_t CGTooltip_GetOwner(lua_State* L) {

src/ui/game/ScriptEvents.cpp

@@ -1,6 +1,11 @@
 #include "ui/game/ScriptEvents.hpp"
+#include "object/client/ObjMgr.hpp"
 #include "ui/FrameScript.hpp"
 #include "ui/ScriptFunctionsSystem.hpp"
+#include "ui/game/CGGameUI.hpp"
+#include "ui/game/ScriptUtil.hpp"
+#include "util/GUID.hpp"
+#include "util/Lua.hpp"
 #include "util/Unimplemented.hpp"
 
 namespace {
@@ -18,7 +23,19 @@ int32_t Script_UnitIsUnit(lua_State* L) {
 }
 
 int32_t Script_UnitIsPlayer(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
+    auto token = lua_tostring(L, 1);
+    WOWGUID guid = 0;
+    Script_GetGUIDFromToken(token, guid, false);
+
+    auto object = ClntObjMgrObjectPtr(guid, TYPE_PLAYER, __FILE__, __LINE__);
+
+    if (object || CGGameUI::IsRaidMember(guid)) {
+        lua_pushnumber(L, 1.0);
+    } else {
+        lua_pushnil(L);
+    }
+
+    return 1;
 }
 
 int32_t Script_UnitIsInMyGuild(lua_State* L) {

src/ui/game/ScriptUtil.cpp

@@ -0,0 +1,191 @@
+#include "ui/game/ScriptUtil.hpp"
+#include "object/Client.hpp"
+#include "ui/game/CGGameUI.hpp"
+#include <storm/String.hpp>
+
+namespace {
+
+bool ParseTrailingTokens(const char* token, WOWGUID& guid, CGPlayer_C* player) {
+    // TODO
+    return true;
+}
+
+}
+
+bool Script_GetGUIDFromString(const char*& token, WOWGUID& guid) {
+    // TODO
+    return true;
+}
+
+bool Script_GetGUIDFromToken(const char* token, WOWGUID& guid, bool defaultToTarget) {
+    auto activePlayer = static_cast<CGPlayer_C*>(ClntObjMgrObjectPtr(ClntObjMgrGetActivePlayer(), TYPE_PLAYER, __FILE__, __LINE__));
+
+    // Null or empty token
+    if (token == nullptr || *token == '\0') {
+        if (defaultToTarget) {
+            guid = CGGameUI::GetLockedTarget();
+
+            return true;
+        }
+
+        return false;
+    }
+
+    guid = 0;
+    auto parseToken = token;
+
+    // player - active player
+    if (!SStrCmpI(parseToken, "player", 6)) {
+        parseToken += 6;
+
+        if (activePlayer) {
+            guid = activePlayer->GetGUID();
+        }
+    }
+
+    // vehicle - active player's vehicle
+    else if (!SStrCmpI(parseToken, "vehicle", 7)) {
+        parseToken += 7;
+
+        // TODO
+    }
+
+    // pet - active player's pet
+    else if (!SStrCmpI(parseToken, "pet", 3)) {
+        parseToken += 3;
+
+        // TODO
+    }
+
+    // target - current locked target
+    else if (!SStrCmpI(parseToken, "target", 6)) {
+        parseToken += 6;
+
+        guid = CGGameUI::GetLockedTarget();
+    }
+
+    // partypet1-4 - party member's pet
+    else if (!SStrCmpI(parseToken, "partypet", 8)) {
+        parseToken += 8;
+
+        auto index = SStrToUnsigned(parseToken);
+        // TODO
+    }
+
+    // party1-4 - party member
+    else if (!SStrCmpI(parseToken, "party", 5)) {
+        parseToken += 5;
+
+        auto index = SStrToUnsigned(parseToken);
+        // TODO
+    }
+
+    // raidpet1-40 - raid member's pet
+    else if (!SStrCmpI(parseToken, "raidpet", 7)) {
+        parseToken += 7;
+
+        auto index = SStrToUnsigned(parseToken);
+        // TODO
+    }
+
+    // raid1-40 - raid member
+    else if (!SStrCmpI(parseToken, "raid", 4)) {
+        parseToken += 4;
+
+        auto index = SStrToUnsigned(parseToken);
+        // TODO
+    }
+
+    // boss1-5 - boss unit
+    else if (!SStrCmpI(parseToken, "boss", 4)) {
+        parseToken += 4;
+
+        auto index = SStrToUnsigned(parseToken);
+        // TODO
+    }
+
+    // arenapet1-5 - arena opponent's pet
+    else if (!SStrCmpI(parseToken, "arenapet", 8)) {
+        parseToken += 8;
+
+        auto index = SStrToUnsigned(parseToken);
+        // TODO
+    }
+
+    // arena1-5 - arena opponent
+    else if (!SStrCmpI(parseToken, "arena", 5)) {
+        parseToken += 5;
+
+        auto index = SStrToUnsigned(parseToken);
+        // TODO
+    }
+
+    // commentator1-N - commentator arena member
+    else if (!SStrCmpI(parseToken, "commentator", 11)) {
+        parseToken += 11;
+
+        auto index = SStrToUnsigned(parseToken);
+        // TODO
+    }
+
+    // mouseover - object under cursor
+    else if (!SStrCmpI(parseToken, "mouseover", 9)) {
+        parseToken += 9;
+
+        auto trackedObjectGuid = CGGameUI::GetCurrentObjectTrack();
+
+        if (ClntObjMgrObjectPtr(trackedObjectGuid, TYPE_UNIT, __FILE__, __LINE__) || CGGameUI::IsRaidMemberOrPet(trackedObjectGuid)) {
+            guid = trackedObjectGuid;
+        }
+    }
+
+    // focus - focus target
+    else if (!SStrCmpI(parseToken, "focus", 5)) {
+        parseToken += 5;
+
+        // TODO
+    }
+
+    // npc - NPC interaction target
+    else if (!SStrCmpI(parseToken, "npc")) {
+        parseToken += 3;
+
+        // TODO
+    }
+
+    // questnpc - quest giver NPC
+    else if (!SStrCmpI(parseToken, "questnpc")) {
+        parseToken += 8;
+
+        // TODO
+    }
+
+    // none
+    else if (!SStrCmpI(parseToken, "none")) {
+        parseToken += 4;
+
+        guid = -1;
+    }
+
+    // Token string was fully parsed or GUID was determined and token string potentially includes
+    // trailing tokens
+    if ((*parseToken == '\0' || guid) && ParseTrailingTokens(parseToken, guid, activePlayer)) {
+        if (!guid) {
+            guid = -2;
+        }
+
+        return true;
+    }
+
+    // Token string was either not parsed or only partially parsed and GUID was not determined
+    if (!guid && Script_GetGUIDFromString(token, guid) && ParseTrailingTokens(token, guid, activePlayer)) {
+        if (!guid) {
+            guid = -2;
+        }
+
+        return true;
+    }
+
+    // GUID was not successfully determined
+    return false;
+}

src/ui/game/ScriptUtil.hpp

@@ -0,0 +1,10 @@
+#ifndef UI_GAME_SCRIPT_UTIL_HPP
+#define UI_GAME_SCRIPT_UTIL_HPP
+
+#include "util/GUID.hpp"
+
+bool Script_GetGUIDFromString(const char*& token, WOWGUID& guid);
+
+bool Script_GetGUIDFromToken(const char* token, WOWGUID& guid, bool defaultToTarget);
+
+#endif

src/ui/simple/CSimpleButtonScript.cpp

@@ -218,7 +218,22 @@ int32_t CSimpleButton_SetFontString(lua_State* L) {
 }
 
 int32_t CSimpleButton_GetFontString(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
+    auto type = CSimpleButton::GetObjectType();
+    auto button = static_cast<CSimpleButton*>(FrameScript_GetObjectThis(L, type));
+    auto text = button->m_text;
+
+    if (!text) {
+        lua_pushnil(L);
+        return 1;
+    }
+
+    if (!text->lua_registered) {
+        text->RegisterScriptObject(nullptr);
+    }
+
+    lua_rawgeti(L, LUA_REGISTRYINDEX, text->lua_objectRef);
+
+    return 1;
 }
 
 int32_t CSimpleButton_SetText(lua_State* L) {

test/CMakeLists.txt

@@ -23,6 +23,8 @@ if(WHOA_SYSTEM_MAC)
             "-framework AppKit"
             "-framework Carbon"
             "-framework IOKit"
+            "-framework Metal"
+            "-framework QuartzCore"
     )
 endif()