Merge e985629f09 into 817cec99fe

src/client/ClientServices.cpp

@@ -160,6 +160,11 @@ ClientConnection* ClientServices::Connection() {
     return ClientServices::s_currentConnection;
 }
 
+uint32_t ClientServices::CharacterValidateName(const char* name) {
+    // TODO
+    return 87;
+}
+
 void ClientServices::Disconnect() {
     ClientServices::Connection()->Disconnect();
 }

src/client/ClientServices.hpp

@@ -33,6 +33,7 @@ class ClientServices : public LoginResponse {
         // Static functions
         static void ConnectToSelectedServer();
         static ClientConnection* Connection();
+        static uint32_t CharacterValidateName(const char* name);
         static void Disconnect();
         static const char* GetCurrentLoginPortal();
         static const char* GetCurrentLoginServer();

src/ui/game/CGCamera.cpp

@@ -80,6 +80,10 @@ void CGCamera::SetupWorldProjection(const CRect& projRect) {
     this->SetGxProjectionAndView(projRect);
 }
 
+C3Vector CGCamera::Target() const {
+    return this->m_position + this->Forward();
+}
+
 C3Vector CGCamera::Up() const {
     if (this->m_relativeTo) {
         return this->CSimpleCamera::Up() * this->ParentToWorld();

src/ui/game/CGCamera.hpp

@@ -27,6 +27,7 @@ class CGCamera : public CSimpleCamera {
         CGCamera();
         C33Matrix ParentToWorld() const;
         void SetupWorldProjection(const CRect& projRect);
+        C3Vector Target() const;
 
     private:
         // Private member variables

src/ui/simple/CSimpleCamera.cpp

@@ -84,6 +84,10 @@ C3Vector CSimpleCamera::Right() const {
     return { this->m_facing.b0, this->m_facing.b1, this->m_facing.b2 };
 }
 
+const C3Vector& CSimpleCamera::Position() const {
+    return this->m_position;
+}
+
 void CSimpleCamera::SetFacing(const C3Vector& forward) {
     BuildBillboardMatrix(forward, this->m_facing);
 }

src/ui/simple/CSimpleCamera.hpp

@@ -18,6 +18,7 @@ class CSimpleCamera {
         // Public member functions
         CSimpleCamera(float nearZ, float farZ, float fov);
         CM2Scene* GetScene();
+        const C3Vector& Position() const;
         void SetFacing(const C3Vector& forward);
         void SetFacing(const C3Vector& forward, const C3Vector& up);
         void SetFacing(float yaw, float pitch, float roll);