mirror of
https://github.com/thunderbrewhq/thunderbrew
synced 2025-07-30 20:20:49 +03:00
Compare commits
1 Commits
5d8ee46d10
...
2e0f37810b
Author | SHA1 | Date | |
---|---|---|---|
![]() |
2e0f37810b |
@ -4,7 +4,6 @@
|
|||||||
#include <common/DataStore.hpp>
|
#include <common/DataStore.hpp>
|
||||||
|
|
||||||
#include "console/Line.hpp"
|
#include "console/Line.hpp"
|
||||||
#include "world/World.hpp"
|
|
||||||
|
|
||||||
|
|
||||||
uint32_t s_newZoneID = 0;
|
uint32_t s_newZoneID = 0;
|
||||||
@ -55,7 +54,7 @@ int32_t LoginVerifyWorldHandler(void* param, NETMESSAGE msgId, uint32_t time, CD
|
|||||||
// return 0;
|
// return 0;
|
||||||
//}
|
//}
|
||||||
//s_newMapname = *(_DWORD*)(v0 + 4);
|
//s_newMapname = *(_DWORD*)(v0 + 4);
|
||||||
LoadNewWorld();
|
//LoadNewWorld(0, 0);
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -81,7 +81,7 @@ void ClientServices::GetCharacterList() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ClientServices::CharacterLogin(uint64_t id, const C3Vector& position) {
|
void ClientServices::CharacterLogin(uint64_t id, const C3Vector& position) {
|
||||||
ClientServices::s_currentConnection->CharacterLogin(id);
|
// TODO
|
||||||
}
|
}
|
||||||
|
|
||||||
REALM_INFO* ClientServices::GetRealmInfoByIndex(int32_t index) {
|
REALM_INFO* ClientServices::GetRealmInfoByIndex(int32_t index) {
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
#include <storm/Log.hpp>
|
#include <storm/Log.hpp>
|
||||||
|
|
||||||
#include "client/Client.hpp"
|
#include "client/Client.hpp"
|
||||||
#include "gameui/CGWorldFrame.hpp"
|
|
||||||
#include "gx/Coordinate.hpp"
|
#include "gx/Coordinate.hpp"
|
||||||
#include "gx/Device.hpp"
|
#include "gx/Device.hpp"
|
||||||
#include "ui/FrameScript.hpp"
|
#include "ui/FrameScript.hpp"
|
||||||
@ -176,7 +175,7 @@ void CGGameUI::Initialize() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void CGGameUI::RegisterFrameFactories() {
|
void CGGameUI::RegisterFrameFactories() {
|
||||||
FrameXML_RegisterFactory("WorldFrame", CGWorldFrame::Create, 1);
|
//FrameXML_RegisterFactory("WorldFrame", (int)CGWorldFrame::Create, 1);
|
||||||
//FrameXML_RegisterFactory("GameTooltip", (int)CGTooltip::Create, 0);
|
//FrameXML_RegisterFactory("GameTooltip", (int)CGTooltip::Create, 0);
|
||||||
//FrameXML_RegisterFactory("Cooldown", (int)sub_51A380, 0);
|
//FrameXML_RegisterFactory("Cooldown", (int)sub_51A380, 0);
|
||||||
//FrameXML_RegisterFactory("Minimap", (int)CGMinimapFrame::Create, 0);
|
//FrameXML_RegisterFactory("Minimap", (int)CGMinimapFrame::Create, 0);
|
||||||
|
@ -1,51 +0,0 @@
|
|||||||
#include "gameui/CGWorldFrame.hpp"
|
|
||||||
|
|
||||||
#include "gx/Transform.hpp"
|
|
||||||
|
|
||||||
#include <storm/Memory.hpp>
|
|
||||||
#include <tempest/Matrix.hpp>
|
|
||||||
|
|
||||||
|
|
||||||
CGWorldFrame* CGWorldFrame::s_currentWorldFrame = nullptr;
|
|
||||||
|
|
||||||
|
|
||||||
CGWorldFrame::CGWorldFrame(CSimpleFrame* parent) : CSimpleFrame(parent) {
|
|
||||||
// TODO
|
|
||||||
s_currentWorldFrame = this;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CGWorldFrame::OnFrameRender(CRenderBatch* batch, uint32_t layer) {
|
|
||||||
CSimpleFrame::OnFrameRender(batch, layer);
|
|
||||||
if (!layer) {
|
|
||||||
batch->QueueCallback(&CGWorldFrame::RenderWorld, this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
CSimpleFrame* CGWorldFrame::Create(CSimpleFrame* parent) {
|
|
||||||
// TODO: Data = CDataAllocator__GetData(0, ".?AVCGWorldFrame@@", -2);
|
|
||||||
|
|
||||||
auto m = SMemAlloc(sizeof(CGWorldFrame), __FILE__, __LINE__, 0);
|
|
||||||
return m ? (new (m) CGWorldFrame(parent)) : nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CGWorldFrame::RenderWorld(void* param) {
|
|
||||||
C44Matrix saved_proj;
|
|
||||||
GxXformProjection(saved_proj);
|
|
||||||
|
|
||||||
C44Matrix saved_view;
|
|
||||||
GxXformView(saved_view);
|
|
||||||
|
|
||||||
CGWorldFrame::OnWorldUpdate();
|
|
||||||
CGWorldFrame::OnWorldRender();
|
|
||||||
|
|
||||||
//PlayerNameRenderWorldText();
|
|
||||||
|
|
||||||
GxXformSetProjection(saved_proj);
|
|
||||||
GxXformSetView(saved_view);
|
|
||||||
}
|
|
||||||
|
|
||||||
void CGWorldFrame::OnWorldUpdate() {
|
|
||||||
}
|
|
||||||
|
|
||||||
void CGWorldFrame::OnWorldRender() {
|
|
||||||
}
|
|
@ -1,22 +0,0 @@
|
|||||||
#ifndef GAME_UI_CGWORLDFRAME_HPP
|
|
||||||
#define GAME_UI_CGWORLDFRAME_HPP
|
|
||||||
|
|
||||||
#include "ui/CSimpleFrame.hpp"
|
|
||||||
#include "ui/CSimpleTop.hpp"
|
|
||||||
|
|
||||||
class CGWorldFrame : public CSimpleFrame {
|
|
||||||
public:
|
|
||||||
CGWorldFrame(CSimpleFrame* parent);
|
|
||||||
|
|
||||||
virtual void OnFrameRender(CRenderBatch* batch, uint32_t layer);
|
|
||||||
|
|
||||||
static CSimpleFrame* Create(CSimpleFrame* parent);
|
|
||||||
static void RenderWorld(void* param);
|
|
||||||
static void OnWorldUpdate();
|
|
||||||
static void OnWorldRender();
|
|
||||||
|
|
||||||
public:
|
|
||||||
static CGWorldFrame* s_currentWorldFrame;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // GAME_UI_CGWORLDFRAME_HPP
|
|
@ -150,10 +150,7 @@ void FrameScript_CreateEvents(const char* names[], uint32_t count) {
|
|||||||
FrameScript::s_scriptEvents.SetCount(count);
|
FrameScript::s_scriptEvents.SetCount(count);
|
||||||
|
|
||||||
for (int32_t i = 0; i < count; i++) {
|
for (int32_t i = 0; i < count; i++) {
|
||||||
FrameScript_EventObject* event = nullptr;
|
auto event = FrameScript::s_scriptEventsHash.New(names[i], 0, 0);
|
||||||
if (names[i]) {
|
|
||||||
event = FrameScript::s_scriptEventsHash.New(names[i], 0, 0);
|
|
||||||
}
|
|
||||||
FrameScript::s_scriptEvents[i] = event;
|
FrameScript::s_scriptEvents[i] = event;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +0,0 @@
|
|||||||
#include "world/World.hpp"
|
|
||||||
|
|
||||||
int32_t LoadNewWorld() {
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
@ -3,6 +3,4 @@
|
|||||||
|
|
||||||
#include "world/CWorld.hpp"
|
#include "world/CWorld.hpp"
|
||||||
|
|
||||||
int32_t LoadNewWorld();
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user