Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-25 06:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dashboard): objects a client script hides on load aren't drawn in the 3D views

Browse Source 
"Clear threat list Trigger Wall" (LOT 13632) on the NS medium property was
drawn as a big red wall: nothing in its data hides it, its client script
does (scripts/02_client/map/general/l_set_invisible.lua sets it invisible in
onRenderComponentReady). The scenery now reads each object's client script
once and treats an object as hidden, like renderDisabled, when a
self:SetVisible{visible = false} is directly in onStartup or
onRenderComponentReady (not under a condition). 12 LOTs match: trigger
volumes, effect containers, a scripted camera, dummies, booty chests (shown
once dug). They show with Hidden objects on.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-28 14:47:37 -05:00
parent 51cd1ddfba
commit 0f747bca18
3 changed files with 84 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dDashboardServer/routes/Scenery.cpp
View File

@@ -144,8 +144,32 @@ namespace {
std::string asset; // RenderComponent.render_asset as stored
std::string type; // Objects.type
int32_t shader{ -1 }; // mapShaders.gameValue of RenderComponent.shader_id (-1 fixed function or unknown)
bool hidesOnLoad{}; // its client script hides it as soon as it loads (WorldScene::ClientScriptHidesOnLoad)
};
// A client script's text, by its ScriptComponent path (backslashes, any case); empty when the client has none
std::string ReadClientScript(const std::string& stored) {
static const auto index = [] {
std::unordered_map<std::string, std::filesystem::path> files;
const auto res = ClientAssets::ResFolder();
if (res.empty()) return files;
std::error_code ec;
for (const auto& top : std::filesystem::directory_iterator(res, ec)) {
if (Lower(top.path().filename().string()) != "scripts" || !top.is_directory(ec)) continue;
for (auto it = std::filesystem::recursive_directory_iterator(top.path(), ec); !ec && it != std::filesystem::recursive_directory_iterator(); it.increment(ec)) {
if (it->is_regular_file(ec)) files.emplace(Lower(std::filesystem::relative(it->path(), res, ec).generic_string()), it->path());
}
}
return files;
}();
auto key = Lower(stored);
std::replace(key.begin(), key.end(), '\\', '/');
const auto it = index.find(key);
if (it == index.end()) return {};
std::ifstream in(it->second, std::ios::binary);
return std::string(std::istreambuf_iterator<char>(in), std::istreambuf_iterator<char>());
}
// mapShaders: id (what RenderComponent.shader_id and multishader tags name) -> gameValue (the shader drawn)
std::map<int32_t, int32_t> g_ShaderValues;
@@ -161,6 +185,19 @@ namespace {
}
auto shaders = CDClientDatabase::ExecuteQuery("SELECT id, gameValue FROM mapShaders;");
for (; !shaders.eof(); shaders.nextRow()) g_ShaderValues.try_emplace(shaders.getIntField(0), shaders.getIntField(1));
// Objects whose client script hides them as soon as they load
auto scripts = CDClientDatabase::ExecuteQuery(
"SELECT cr.id, sc.client_script_name FROM ComponentsRegistry cr JOIN ScriptComponent sc ON sc.id = cr.component_id "
"WHERE cr.component_type = " + std::to_string(static_cast<int32_t>(eReplicaComponentType::SCRIPT)) + " AND sc.client_script_name IS NOT NULL AND sc.client_script_name != '';");
std::unordered_map<std::string, bool> hides; // by script, read once
for (; !scripts.eof(); scripts.nextRow()) {
const auto it = infos.find(static_cast<uint32_t>(scripts.getIntField(0)));
if (it == infos.end()) continue;
const std::string script = scripts.getStringField(1, "");
auto [known, added] = hides.try_emplace(script, false);
if (added) known->second = WorldScene::ClientScriptHidesOnLoad(ReadClientScript(script));
it->second.hidesOnLoad = it->second.hidesOnLoad || known->second;
}
auto types = CDClientDatabase::ExecuteQuery("SELECT id, type FROM Objects;");
for (; !types.eof(); types.nextRow()) {
const auto it = infos.find(static_cast<uint32_t>(types.getIntField(0)));
@@ -192,7 +229,8 @@ namespace {
const auto& infos = RenderInfos();
const auto info = infos.find(lot);
if (info == infos.end()) return {};
const auto draw = WorldScene::ClientDraws(object, info->second.type);
auto draw = WorldScene::ClientDraws(object, info->second.type);
if (draw == WorldScene::eClientDraw::DRAWN && info->second.hidesOnLoad) draw = WorldScene::eClientDraw::HIDDEN;
if (draw == WorldScene::eClientDraw::NO_MODEL) return {};
static std::mutex mutex;
static std::unordered_map<std::string, std::string> resolved;