natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

push mapCreationWizard across to new DBC lib

Browse Source
This commit is contained in:
Alister
2021-12-24 12:24:57 +00:00
parent b76889dc91
commit 3909ab7e80
6 changed files with 67 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/noggit/DBC.cpp
View File

@@ -3,7 +3,7 @@
#include <noggit/DBC.h>
#include <noggit/Log.h>
#include <noggit/Misc.h>
#include <blizzard-archive-library/include/ClientData.hpp>
#include <string>
AreaDB gAreaDB;
@@ -18,19 +18,19 @@ GroundEffectDoodadDB gGroundEffectDoodadDB;
GroundEffectTextureDB gGroundEffectTextureDB;
LiquidTypeDB gLiquidTypeDB;
void OpenDBs()
void OpenDBs(std:: shared_ptr<BlizzardArchive::ClientData> clientData)
{
gAreaDB.open();
gMapDB.open();
gLoadingScreensDB.open();
gLightDB.open();
gLightParamsDB.open();
gLightSkyboxDB.open();
gLightIntBandDB.open();
gLightFloatBandDB.open();
gGroundEffectDoodadDB.open();
gGroundEffectTextureDB.open();
gLiquidTypeDB.open();
gAreaDB.open(clientData);
gMapDB.open(clientData);
gLoadingScreensDB.open(clientData);
gLightDB.open(clientData);
gLightParamsDB.open(clientData);
gLightSkyboxDB.open(clientData);
gLightIntBandDB.open(clientData);
gLightFloatBandDB.open(clientData);
gGroundEffectDoodadDB.open(clientData);
gGroundEffectTextureDB.open(clientData);
gLiquidTypeDB.open(clientData);
}

2
src/noggit/DBC.h
View File

@@ -184,7 +184,7 @@ public:
static std::string getLiquidName(int pID);
};
void OpenDBs();
void OpenDBs(std::shared_ptr<BlizzardArchive::ClientData> clientData);
const char * getGroundEffectDoodad(unsigned int effectID, int DoodadNum);

4
src/noggit/DBCFile.cpp
View File

@@ -24,9 +24,9 @@ DBCFile::DBCFile(const std::string& _filename)
: filename(_filename)
{}
void DBCFile::open()
void DBCFile::open(std::shared_ptr<BlizzardArchive::ClientData> clientData)
{
BlizzardArchive::ClientFile f (filename, Noggit::Application::NoggitApplication::instance()->clientData());
BlizzardArchive::ClientFile f (filename, clientData.get());
if (f.isEof())
{

3
src/noggit/DBCFile.h
View File

@@ -8,6 +8,7 @@
#include <stdexcept>
#include <cstring>
#include <algorithm>
#include <blizzard-archive-library/include/ClientData.hpp>
class DBCFile
{
@@ -15,7 +16,7 @@ public:
explicit DBCFile(const std::string& filename);
// Open database. It must be openened before it can be used.
void open();
void open(std::shared_ptr<BlizzardArchive::ClientData> clientData);
void save();
class NotFound : public std::runtime_error

57
src/noggit/ui/tools/MapCreationWizard/Ui/MapCreationWizard.cpp
View File

@@ -91,6 +91,8 @@ MapCreationWizard::MapCreationWizard(std::shared_ptr<Project::NoggitProject> pro
count++;
}
_project->ClientDatabase->UnloadTable("map");
auto add_btn = new QPushButton("New",this);
add_btn->setIcon(Noggit::Ui::FontAwesomeIcon(Noggit::Ui::FontAwesome::plus));
layout_selector->addWidget(add_btn);
@@ -298,7 +300,9 @@ void MapCreationWizard::selectMap(int map_id)
{
_is_new_record = false;
DBCFile::Record record = gMapDB.getByID(map_id);
auto table = _project->ClientDatabase->LoadTable("map");
auto record = table.Record(map_id);
_cur_map_id = map_id;
if (_world)
@@ -306,10 +310,21 @@ void MapCreationWizard::selectMap(int map_id)
delete _world;
}
_world = new World(record.getString(MapDB::InternalName), map_id, Noggit::NoggitRenderContext::MAP_VIEW);
auto directoryName = record.Columns["Directory"].Value;
auto instanceType = record.Columns["InstanceType"].Value;
auto mapName = record.Columns["MapName_lang"].Value;
auto areaTableId = record.Columns["AreaTableID"].Value;
auto loadingScreenId = record.Columns["LoadingScreenID"].Value;
auto minimapIconScale = record.Columns["MinimapIconScale"].Value;
auto corpseMapId = record.Columns["CorpseMapID"].Value;
auto corpseCoords = record.Columns["Corpse"].Values;
auto expansionId = record.Columns["ExpansionID"].Value;
auto maxPlayers = record.Columns["MaxPlayers"].Value;
auto timeOffset = record.Columns["TimeOffset"].Value;
_world = new World(directoryName, map_id, Noggit::NoggitRenderContext::MAP_VIEW);
_minimap_widget->world(_world);
_directory->setText(record.getString(1));
_directory->setText(QString::fromStdString(directoryName));
_directory->setEnabled(false);
_is_big_alpha->setChecked(_world->mapIndex.hasBigAlpha());
@@ -317,19 +332,19 @@ void MapCreationWizard::selectMap(int map_id)
_sort_by_size_cat->setChecked(_world->mapIndex.sort_models_by_size_class());
_instance_type->setCurrentIndex(record.getInt(2));
_instance_type->setCurrentIndex(std::atoi(instanceType.c_str()));
_map_name->fill(record, 5);
//_map_name->fill(record, 5);
_area_table_id->setValue(record.getInt(22));
_area_table_id->setValue(std::atoi(areaTableId.c_str()));
_map_desc_alliance->fill(record, 23);
_map_desc_horde->fill(record, 40);
//_map_desc_alliance->fill(record, 23);
//_map_desc_horde->fill(record, 40);
_loading_screen->setValue(record.getInt(57));
_minimap_icon_scale->setValue(record.getFloat(58));
_loading_screen->setValue(std::atoi(loadingScreenId.c_str()));
_minimap_icon_scale->setValue(std::atof(minimapIconScale.c_str()));
int corpse_map_idx = record.getInt(59);
int corpse_map_idx = std::atoi(corpseMapId.c_str());
for (int i = 0; i < _corpse_map_id->count(); ++i)
{
if (_corpse_map_id->itemData(i) == corpse_map_idx)
@@ -338,12 +353,20 @@ void MapCreationWizard::selectMap(int map_id)
}
}
_corpse_x->setValue(record.getFloat(60));
_corpse_y->setValue(record.getFloat(61));
_time_of_day_override->setValue(record.getInt(62));
_expansion_id->setCurrentIndex(record.getInt(63));
_raid_offset->setValue(record.getInt(64));
_max_players->setValue(record.getInt(65));
if(corpseCoords.size() > 0)
{
_corpse_x->setValue(std::atoi(corpseCoords[0].c_str()));
_corpse_y->setValue(std::atoi(corpseCoords[1].c_str()));
}
_time_of_day_override->setValue(std::atoi(timeOffset.c_str()));
_expansion_id->setCurrentIndex(std::atoi(expansionId.c_str()));
//_raid_offset->setValue(record.getInt(64)); only ever used in 2 places? not sure what for
_max_players->setValue(std::atoi(maxPlayers.c_str()));
_project->ClientDatabase->UnloadTable("map");
}
void MapCreationWizard::wheelEvent(QWheelEvent* event)

12
src/noggit/ui/windows/mainWindow/main_window.cpp
View File

@@ -65,7 +65,10 @@ namespace Noggit::Ui
setWindowTitle (QString::fromStdString (title.str()));
setWindowIcon (QIcon (":/icon"));
//OpenDBs();
if(project->ProjectVersion == Project::ProjectVersion::WOTLK)
{
OpenDBs(project->ClientData);
}
setCentralWidget (_null_widget);
createBookmarkList();
@@ -195,11 +198,14 @@ namespace Noggit::Ui
_world.reset();
auto table = _project->ClientDatabase->LoadTable("Map");
auto table = _project->ClientDatabase->LoadTable("map");
auto record = table.Record(mapID);
_world = std::make_unique<World>(record.Columns["Directory"].Value, mapID, Noggit::NoggitRenderContext::MAP_VIEW);
_minimap->world(_world.get());
_project->ClientDatabase->UnloadTable("map");
emit map_selected(mapID);
}
@@ -345,7 +351,7 @@ namespace Noggit::Ui
e.name = record.Columns["MapName_lang"].Value;
e.areaType = std::stoi(record.Columns["InstanceType"].Value);
if (e.areaType < 0 || e.areaType > 4 || !World::IsEditableWorld(record))
if (e.areaType < 0 || e.areaType > 4 || !World::IsEditableWorld(record))
continue;
auto item(new QListWidgetItem(QString::number(e.mapID) + " - " + QString::fromUtf8(e.name.c_str()),