PM/DYTSrouce
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify entity

Browse Source
This commit is contained in:
brige 2025-11-02 00:02:20 +08:00
parent 5c5143e6c2
commit 596d60f6bc
16 changed files with 158 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/entities/EntitiesManager.cpp
View File

@ -180,7 +180,7 @@ Entity* EntitiesManager::CreateEntity(const QString& type, WorkSpace* workspace)
return entity;
}
Entity* EntitiesManager::CreateEntityWithComponents(const QString& type, WorkSpace* workspace) {
Entity* EntitiesManager::CreateEntityWithComponents(const QString& type, const QString& mesh, bool useLabel, WorkSpace* workspace) {
if (!initialized_) {
Initialize();
}
@ -189,7 +189,7 @@ Entity* EntitiesManager::CreateEntityWithComponents(const QString& type, WorkSpa
workspace = WorkSpaceManager::Get().GetCurrent();
}
Entity* entity = EntityFactory::Get().CreateEntityWithComponents(type, workspace);
Entity* entity = EntityFactory::Get().CreateEntityWithComponents(type, mesh, useLabel, workspace);
if (entity) {
AddEntity(entity);
if (workspace) {

2
src/entities/EntitiesManager.h
View File

@ -32,7 +32,7 @@ public:
// New factory methods
Entity* CreateEntity(const QString& type, WorkSpace* workspace = nullptr);
Entity* CreateEntityWithComponents(const QString& type, WorkSpace* workspace = nullptr);
Entity* CreateEntityWithComponents(const QString& type, const QString& mesh, bool useLabel, WorkSpace* workspace = nullptr);
// Get supported entity types
QStringList GetSupportedEntityTypes() const;

25
src/entities/EntityFactory.cpp
View File

@ -23,7 +23,7 @@ Entity* EntityFactory::CreateEntity(const QString& type, WorkSpace* workspace) {
return entity;
}
Entity* EntityFactory::CreateEntityWithComponents(const QString& type, WorkSpace* workspace) {
Entity* EntityFactory::CreateEntityWithComponents(const QString& type, const QString& mesh, bool useLabel, WorkSpace* workspace) {
Entity* entity = CreateEntity(type, workspace);
if (!entity) {
return nullptr;
@ -36,15 +36,36 @@ Entity* EntityFactory::CreateEntityWithComponents(const QString& type, WorkSpace
// Get default mesh
QString defaultMesh = it->second->GetDefaultMesh();
if (!mesh.isEmpty()) {
defaultMesh = mesh;
}
if (!defaultMesh.isEmpty()) {
SceneComponent* meshComponent = ComponentFactory::Create("MeshComponent", nullptr);
if (meshComponent) {
meshComponent->SetAttribute("mesh", defaultMesh.toStdString().c_str());
meshComponent->SetAttribute("mesh", defaultMesh.toLocal8Bit());
meshComponent->AttachEntity(entity);
LOG_INFO("EntityFactory::CreateEntityWithComponents - Added MeshComponent with mesh: {}", defaultMesh.toStdString());
}
}
if (useLabel) {
SceneComponent* rootComponent = entity->GetRootComponent();
if (nullptr == rootComponent) {
SceneComponent* meshComponent = ComponentFactory::Create("LabelComponent", nullptr);
if (meshComponent) {
meshComponent->AttachEntity(entity);
LOG_INFO("EntityFactory::CreateEntityWithComponents - Added LabelComponent with mesh: {}", defaultMesh.toStdString());
}
}
else {
SceneComponent* LabelComponent = ComponentFactory::Create("LabelComponent", rootComponent);
if (LabelComponent) {
LabelComponent->AttachTo(rootComponent);
LOG_INFO("EntityFactory::CreateEntityWithComponents - Added LabelComponent with mesh: {}", defaultMesh.toStdString());
}
}
}
// Add required components
QStringList requiredComponents = it->second->GetRequiredComponents();
SceneComponent* rootComponent = entity->GetRootComponent();

2
src/entities/EntityFactory.h
View File

@ -66,7 +66,7 @@ public:
Entity* CreateEntity(const QString& type, WorkSpace* workspace);
Entity* CreateEntityWithComponents(const QString& type, WorkSpace* workspace);
Entity* CreateEntityWithComponents(const QString& type, const QString& mesh, bool useLabel, WorkSpace* workspace);
QStringList GetRegisteredTypes() const;

24
src/translations/Dyt_zh_CN.ts
View File

@ -2082,12 +2082,12 @@
<context>
<name>OsgWidget</name>
<message>
<location filename="../viewer/OsgWidget.cpp" line="130"/>
<location filename="../viewer/OsgWidget.cpp" line="131"/>
<source>warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../viewer/OsgWidget.cpp" line="131"/>
<location filename="../viewer/OsgWidget.cpp" line="132"/>
<source>open dyt file failed</source>
<translation type="unfinished"></translation>
</message>
@ -2188,26 +2188,6 @@
<source>Preset Models</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/ModelBrowser/PresetModelPanel.ui" line="47"/>
<source>Ships</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/ModelBrowser/PresetModelPanel.ui" line="87"/>
<source>Satellites</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/ModelBrowser/PresetModelPanel.ui" line="127"/>
<source>Missiles</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../ui/ModelBrowser/PresetModelPanel.ui" line="167"/>
<source>Jammers</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PropertyBrowser</name>

2
src/ui/ModelBrowser/PresetModelListWidget.cpp
View File

@ -131,6 +131,8 @@ void PresetModelListWidget::setModelList(const QVector<ModelInfo>& models) {
painter.drawText(pixmap.rect(), Qt::AlignCenter, "?");
item->setIcon(QIcon(pixmap));
}
item->setToolTip(modelInfo.description.isEmpty() ? modelInfo.name : modelInfo.description);
// Store model name as simple string
item->setData(Qt::UserRole, modelInfo.name);

2
src/ui/ModelBrowser/PresetModelListWidget.h
View File

@ -1,3 +1,5 @@
#pragma once
#include <QListWidget>
#include <QString>

144
src/ui/ModelBrowser/PresetModelPanel.cpp
View File

@ -14,11 +14,13 @@
#include <QIcon>
#include <QMouseEvent>
#include <QFontMetrics>
#include <QWidget>
#include "common/RecourceHelper.h"
#include "common/SpdLogger.h"
#include "ui/DockTitleBar.h"
#include "ui/DockWidget.h"
#include "workspace/PresetModelConfigParser.h"
#include "ui_PresetModelPanel.h"
@ -34,6 +36,7 @@ PresetModelPanel::PresetModelPanel(QWidget *parent)
PresetModelPanel::~PresetModelPanel()
{
ClearDynamicUI();
delete ui;
}
@ -57,80 +60,97 @@ void PresetModelPanel::InitUI()
QString presetsPath = QString("%1/presets").arg(RecourceHelper::Get().GetResourcesPath());
if (PresetModelConfigParser::Get().LoadAllConfigs(presetsPath)) {
// Successfully loaded from configuration files
CreateDynamicUI();
LoadModelsFromConfig();
} else {
// Failed to load configuration files, use hardcoded defaults as fallback
LOG_WARN("Failed to load preset models from config files, using hardcoded defaults. Error: {}",
PresetModelConfigParser::Get().GetLastError().toStdString());
LoadDefaultModels();
}
}
void PresetModelPanel::CreateDynamicUI()
{
// Clear any existing dynamic UI
ClearDynamicUI();
// Get all category names from configuration
QStringList categoryNames = PresetModelConfigParser::Get().GetCategoryNames();
if (categoryNames.isEmpty()) {
LOG_WARN("No categories found in configuration");
return;
}
// Create UI for each category
for (const QString& categoryName : categoryNames) {
ModelCategory category = PresetModelConfigParser::Get().GetCategory(categoryName);
// Create page widget
QWidget* page = new QWidget();
page->setObjectName(QString("%1Page").arg(categoryName.toLower()));
// Create layout for the page
QVBoxLayout* layout = new QVBoxLayout(page);
layout->setSpacing(0);
layout->setContentsMargins(0, 0, 0, 0);
// Create list widget
PresetModelListWidget* listWidget = new PresetModelListWidget(page);
listWidget->setObjectName(QString("%1List").arg(categoryName.toLower()));
listWidget->setDragDropMode(QAbstractItemView::DragOnly);
listWidget->setDefaultDropAction(Qt::CopyAction);
// Add list widget to layout
layout->addWidget(listWidget);
// Add page to toolbox with display name
QString displayName = category.displayName.isEmpty() ? categoryName : category.displayName;
ui->PresetModelToolBox->addItem(page, displayName);
// Store references for later use
categoryWidgets_[categoryName] = listWidget;
categoryPages_[categoryName] = page;
LOG_INFO("Created dynamic UI for category: {}", categoryName.toStdString());
}
// Set first page as current if available
if (ui->PresetModelToolBox->count() > 0) {
ui->PresetModelToolBox->setCurrentIndex(0);
}
}
void PresetModelPanel::LoadModelsFromConfig() {
// Load ship models
ModelCategory shipCategory = PresetModelConfigParser::Get().GetCategory("Ship");
if (!shipCategory.models.isEmpty()) {
ui->shipList->setModelType("Ship");
ui->shipList->setModelList(shipCategory.models);
}
// Load models for each dynamically created category
QStringList categoryNames = PresetModelConfigParser::Get().GetCategoryNames();
// Load satellite models
ModelCategory satelliteCategory = PresetModelConfigParser::Get().GetCategory("Satellite");
if (!satelliteCategory.models.isEmpty()) {
ui->satelliteList->setModelType("Satellite");
ui->satelliteList->setModelList(satelliteCategory.models);
}
// Load missile models
ModelCategory missileCategory = PresetModelConfigParser::Get().GetCategory("Missile");
if (!missileCategory.models.isEmpty()) {
ui->missileList->setModelType("Missile");
ui->missileList->setModelList(missileCategory.models);
}
// Load jammer models
ModelCategory jammerCategory = PresetModelConfigParser::Get().GetCategory("Jammer");
if (!jammerCategory.models.isEmpty()) {
ui->jammerList->setModelType("Jammer");
ui->jammerList->setModelList(jammerCategory.models);
for (const QString& categoryName : categoryNames) {
ModelCategory category = PresetModelConfigParser::Get().GetCategory(categoryName);
if (!category.models.isEmpty() && categoryWidgets_.contains(categoryName)) {
PresetModelListWidget* listWidget = categoryWidgets_[categoryName];
listWidget->setModelType(categoryName);
listWidget->setModelList(category.models);
LOG_INFO("Loaded {} models for category: {}",
category.models.size(), categoryName.toStdString());
}
}
}
void PresetModelPanel::LoadDefaultModels() {
// Use hardcoded default models as fallback mechanism
QVector<ModelInfo> shipModels = {
{"destroyer", "Destroyer", "Naval destroyer vessel", "", ":/icons/ship.png", true},
{"aircraft_carrier", "Aircraft Carrier", "Large naval vessel", "", ":/icons/ship.png", true},
{"frigate", "Frigate", "Fast naval vessel", "", ":/icons/ship.png", true},
{"submarine", "Submarine", "Underwater vessel", "", ":/icons/ship.png", true}
};
ui->shipList->setModelType("Ship");
ui->shipList->setModelList(shipModels);
void PresetModelPanel::ClearDynamicUI()
{
// Clear all dynamic UI elements
categoryWidgets_.clear();
categoryPages_.clear();
QVector<ModelInfo> satelliteModels = {
{"comm_satellite", "Communication Satellite", "Communication satellite", "", ":/icons/satellite.png", true},
{"weather_satellite", "Weather Satellite", "Weather monitoring satellite", "", ":/icons/satellite.png", true},
{"gps_satellite", "GPS Satellite", "GPS navigation satellite", "", ":/icons/satellite.png", true},
{"spy_satellite", "Spy Satellite", "Reconnaissance satellite", "", ":/icons/satellite.png", true}
};
ui->satelliteList->setModelType("Satellite");
ui->satelliteList->setModelList(satelliteModels);
QVector<ModelInfo> missileModels = {
{"cruise_missile", "Cruise Missile", "Long-range cruise missile", "", ":/icons/missile.png", true},
{"ballistic_missile", "Ballistic Missile", "Ballistic missile", "", ":/icons/missile.png", true},
{"anti_ship_missile", "Anti-Ship Missile", "Anti-ship missile", "", ":/icons/missile.png", true},
{"sam_missile", "Surface-to-Air Missile", "Surface-to-air missile", "", ":/icons/missile.png", true}
};
ui->missileList->setModelType("Missile");
ui->missileList->setModelList(missileModels);
QVector<ModelInfo> jammerModels = {
{"electronic_jammer", "Electronic Jammer", "Electronic warfare jammer", "", ":/icons/jammer.png", true},
{"comm_jammer", "Communication Jammer", "Communication jammer", "", ":/icons/jammer.png", true},
{"radar_jammer", "Radar Jammer", "Radar jamming device", "", ":/icons/jammer.png", true},
{"gps_jammer", "GPS Jammer", "GPS jamming device", "", ":/icons/jammer.png", true}
};
ui->jammerList->setModelType("Jammer");
ui->jammerList->setModelList(jammerModels);
// Remove all pages from toolbox
while (ui->PresetModelToolBox->count() > 0) {
QWidget* widget = ui->PresetModelToolBox->widget(0);
ui->PresetModelToolBox->removeItem(0);
if (widget) {
widget->deleteLater();
}
}
}

23
src/ui/ModelBrowser/PresetModelPanel.h
View File

@ -14,9 +14,10 @@
#include <QStyledItemDelegate>
#include <QPainter>
#include <QApplication>
#include <QMap>
#include "workspace/ModelInfo.h"
#include "workspace/PresetModelConfigParser.h"
#include "ui/ModelBrowser/PresetModelListWidget.h"
namespace Ui { class PresetModelPanel; }
@ -26,11 +27,8 @@ class DockWidget;
/**
* @brief Preset model panel class
*
* Provides preset 3D models for users to drag into the 3D scene, including:
* - Ships: Destroyer, Aircraft Carrier
* - Satellites: Geostationary Satellites
* - Missiles: Hypersonic Missiles
* - Jammers: Passive Jammers, Active Jammers
* Provides preset 3D models for users to drag into the 3D scene.
* Dynamically creates UI based on configuration files, supporting any number of categories.
*/
class PresetModelPanel : public QWidget {
Q_OBJECT
@ -51,19 +49,28 @@ private:
*/
void InitUI();
/**
* @brief Create dynamic UI based on configuration
*/
void CreateDynamicUI();
/**
* @brief Load models from configuration file
*/
void LoadModelsFromConfig();
/**
* @brief Load default models when config is unavailable
* @brief Clear all dynamic UI elements
*/
void LoadDefaultModels();
void ClearDynamicUI();
private:
Ui::PresetModelPanel *ui;
// Dynamic UI management
QMap<QString, PresetModelListWidget*> categoryWidgets_;
QMap<QString, QWidget*> categoryPages_;
// Drag and drop support
QPoint dragStartPosition_;
QListWidget* dragSourceWidget_;

162
src/ui/ModelBrowser/PresetModelPanel.ui
View File

@ -32,168 +32,8 @@
<item>
<widget class="QToolBox" name="PresetModelToolBox">
<property name="currentIndex">
<number>0</number>
<number>-1</number>
</property>
<widget class="QWidget" name="shipPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>290</width>
<height>470</height>
</rect>
</property>
<attribute name="label">
<string>Ships</string>
</attribute>
<layout class="QVBoxLayout" name="shipLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="PresetModelListWidget" name="shipList">
<property name="dragDropMode">
<enum>QAbstractItemView::DragOnly</enum>
</property>
<property name="defaultDropAction">
<enum>Qt::CopyAction</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="satellitePage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>290</width>
<height>470</height>
</rect>
</property>
<attribute name="label">
<string>Satellites</string>
</attribute>
<layout class="QVBoxLayout" name="satelliteLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="PresetModelListWidget" name="satelliteList">
<property name="dragDropMode">
<enum>QAbstractItemView::DragOnly</enum>
</property>
<property name="defaultDropAction">
<enum>Qt::CopyAction</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="missilePage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>73</height>
</rect>
</property>
<attribute name="label">
<string>Missiles</string>
</attribute>
<layout class="QVBoxLayout" name="missileLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="PresetModelListWidget" name="missileList">
<property name="dragDropMode">
<enum>QAbstractItemView::DragOnly</enum>
</property>
<property name="defaultDropAction">
<enum>Qt::CopyAction</enum>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="jammerPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>98</width>
<height>73</height>
</rect>
</property>
<attribute name="label">
<string>Jammers</string>
</attribute>
<layout class="QVBoxLayout" name="jammerLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="PresetModelListWidget" name="jammerList">
<property name="dragDropMode">
<enum>QAbstractItemView::DragOnly</enum>
</property>
<property name="defaultDropAction">
<enum>Qt::CopyAction</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>

10
src/viewer/OsgWidget.cpp
View File

@ -28,6 +28,7 @@
#include "workspace/PresetModelConfigParser.h"
#include "entities/EntitiesManager.h"
#include "entities/EntityFactory.h"
#include "entities/ComponentFactory.h"
#include "entities/Entity.h"
#include "entities/Component.h"
@ -271,7 +272,14 @@ void OsgWidget::OnPresetModelDropped(const QString& modelType, const QString& mo
height = 0.0;
}
Entity* entity = EntitiesManager::Get().CreateEntityWithComponents(modelType, currentWorkSpace);
bool success = false;
ModelInfo modelInfo = PresetModelConfigParser::Get().GetModelInfo(modelType, modelName, &success);
if (!success) {
LOG_ERROR("OsgWidget::OnPresetModelDropped - Failed to get model info of type:{} name:{}", modelType.toStdString(), modelName.toStdString());
return;
}
Entity* entity = EntitiesManager::Get().CreateEntityWithComponents(modelType, modelInfo.meshFile, modelInfo.useLabel, currentWorkSpace);
if (nullptr == entity) {
LOG_ERROR("OsgWidget::OnPresetModelDropped - Failed to create entity of type: {}", modelType.toStdString());
return;

2
src/viewer/OsgWidget.h
View File

@ -1,4 +1,4 @@
#pragma once
#pragma once
#include <QTimer>
#include <osgViewer/CompositeViewer>

11
src/workspace/ModelInfo.h
View File

@ -7,7 +7,7 @@
* @brief Model information structure
*
* Contains all information for a single preset model, including name, display name,
* description, mesh file path, icon path, and enabled status.
* description, mesh file path, icon path, enabled status, and entity registration info.
*/
struct ModelInfo {
QString name; ///< Model name (unique identifier)
@ -15,21 +15,24 @@ struct ModelInfo {
QString description; ///< Model description
QString meshFile; ///< 3D mesh file path
QString icon; ///< Icon file path
bool useLabel;
bool enabled; ///< Whether this model is enabled
/**
* @brief Default constructor
* Model is enabled by default
*/
ModelInfo() : enabled(true) {}
ModelInfo() : useLabel(true), enabled(true) {}
/**
* @brief Constructor with parameters
*/
ModelInfo(const QString& name, const QString& displayName, const QString& description,
const QString& meshFile, const QString& icon, bool enabled = true)
const QString& meshFile, const QString& icon, bool enabled = true,
const QString& entityType = "", const QString& entityClass = "",
const QStringList& requiredComponents = QStringList())
: name(name), displayName(displayName), description(description),
meshFile(meshFile), icon(icon), enabled(enabled) {}
meshFile(meshFile), icon(icon), useLabel(true), enabled(enabled) {}
};
/**

7
src/workspace/PresetModelConfigParser.cpp
View File

@ -105,8 +105,14 @@ bool PresetModelConfigParser::ParseXmlFile(const QString& filePath)
const char* description = modelElement->Attribute("description");
const char* meshFile = modelElement->Attribute("meshFile");
const char* modelIcon = modelElement->Attribute("icon");
const char* label = modelElement->Attribute("label");
const char* enabled = modelElement->Attribute("enabled");
// Entity registration attributes
const char* entityType = modelElement->Attribute("entityType");
const char* entityClass = modelElement->Attribute("entityClass");
const char* requiredComponents = modelElement->Attribute("requiredComponents");
if (!modelName) {
LOG_WARN("Model element missing name attribute in file: {}", filePath.toStdString());
modelElement = modelElement->NextSiblingElement("model");
@ -118,6 +124,7 @@ bool PresetModelConfigParser::ParseXmlFile(const QString& filePath)
model.description = description ? QString::fromUtf8(description) : "";
model.meshFile = meshFile ? QString::fromUtf8(meshFile) : "";
model.icon = modelIcon ? QString::fromUtf8(modelIcon) : "";
model.useLabel = label ? (strcmp(label, "true") == 0) : true;
model.enabled = enabled ? (strcmp(enabled, "true") == 0) : true;
category.models.append(model);

2
workspace/presets/jammers.xml
View File

@ -9,5 +9,5 @@
description="Multi-frequency signal jamming equipment"
meshFile="models/signal_jammer.ive"
icon="icons/signal_jammer_icon.png"
enabled="true" />
enabled="true"/>
</modelCategory>

4
workspace/presets/ships.xml
View File

@ -4,10 +4,10 @@
description="High-speed combat vessel with powerful anti-submarine and air defense capabilities"
meshFile="models/destroyer.ive"
icon="icons/destroyer_icon.png"
enabled="true" />
enabled="true"/>
<model name="Aircraft Carrier" displayName="Aircraft Carrier"
description="Large aircraft carrier, mobile airfield and command center at sea"
meshFile="models/carrier.ive"
icon="icons/carrier_icon.png"
enabled="true" />
enabled="true"/>
</modelCategory>