Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

cfiController 1 + fix bug BUSY FREE not for Unity

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-01-27 12:34:20 +03:00
parent b452ef347d
commit 4ce3f53171
9 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
LibServer/cficontroller/cficontroller.cpp
View File

@@ -2,9 +2,10 @@
CfiController::CfiController(UpdateController* updateController, QObject *parent) :
QObject(parent),
updateController(updateController)
updateController(updateController),
germanLocale(nullptr)
{
germanLocale = new QLocale(QLocale::German);
}
CfiController::~CfiController()
@@ -84,15 +85,15 @@ bool CfiController::parsingCfiXML()
setCamPos.state = nodeMapSetcamerapos.namedItem("state").nodeValue();
setCamPos.panelName = nodeMapSetcamerapos.namedItem("panelName").nodeValue();
setCamPos.prevCamOffsetMARposY = nodeMapSetcamerapos.namedItem("prevCamOffsetMARposY").nodeValue().toFloat();
setCamPos.camOffsetMARposY = nodeMapSetcamerapos.namedItem("camOffsetMARposY").nodeValue().toFloat();
setCamPos.prevCharControlerHeight = nodeMapSetcamerapos.namedItem("prevCharControlerHeight").nodeValue().toFloat();
setCamPos.charControlerHeight = nodeMapSetcamerapos.namedItem("charControlerHeight").nodeValue().toFloat();
setCamPos.FOV = nodeMapSetcamerapos.namedItem("FOV").nodeValue().toFloat();
setCamPos.moveSpeed = nodeMapSetcamerapos.namedItem("moveSpeed").nodeValue().toFloat();
setCamPos.projectionSize = nodeMapSetcamerapos.namedItem("projectionSize").nodeValue().toFloat();
setCamPos.offset = nodeMapSetcamerapos.namedItem("offset").nodeValue().toFloat();
setCamPos.prevPlayerRot = nodeMapSetcamerapos.namedItem("prevPlayerRot").nodeValue().toFloat();
setCamPos.prevCamOffsetMARposY = germanLocale->toFloat(nodeMapSetcamerapos.namedItem("prevCamOffsetMARposY").nodeValue());
setCamPos.camOffsetMARposY = germanLocale->toFloat(nodeMapSetcamerapos.namedItem("camOffsetMARposY").nodeValue());
setCamPos.prevCharControlerHeight = germanLocale->toFloat(nodeMapSetcamerapos.namedItem("prevCharControlerHeight").nodeValue());
setCamPos.charControlerHeight = germanLocale->toFloat(nodeMapSetcamerapos.namedItem("charControlerHeight").nodeValue());
setCamPos.FOV = germanLocale->toFloat(nodeMapSetcamerapos.namedItem("FOV").nodeValue());
setCamPos.moveSpeed = germanLocale->toFloat(nodeMapSetcamerapos.namedItem("moveSpeed").nodeValue());
setCamPos.projectionSize = germanLocale->toFloat(nodeMapSetcamerapos.namedItem("projectionSize").nodeValue());
setCamPos.offset = germanLocale->toFloat(nodeMapSetcamerapos.namedItem("offset").nodeValue());
setCamPos.prevPlayerRot = germanLocale->toFloat(nodeMapSetcamerapos.namedItem("prevPlayerRot").nodeValue());
//childs setcamerapos
QDomElement loc_Element;
@@ -132,9 +133,9 @@ QVector3D CfiController::getXYZfromElement(QDomElement element)
{
QVector3D vector3D;
QDomNamedNodeMap nodeMap = element.attributes();
vector3D.setX(nodeMap.namedItem("x").nodeValue().toFloat());
vector3D.setY(nodeMap.namedItem("y").nodeValue().toFloat());
vector3D.setZ(nodeMap.namedItem("z").nodeValue().toFloat());
vector3D.setX(germanLocale->toFloat(nodeMap.namedItem("x").nodeValue()));
vector3D.setY(germanLocale->toFloat(nodeMap.namedItem("y").nodeValue()));
vector3D.setZ(germanLocale->toFloat(nodeMap.namedItem("z").nodeValue()));
return vector3D;
}
@@ -142,7 +143,7 @@ QVector2D CfiController::getXYfromElement(QDomElement element)
{
QVector2D vector2D;
QDomNamedNodeMap nodeMap = element.attributes();
vector2D.setX(nodeMap.namedItem("x").nodeValue().toFloat());
vector2D.setY(nodeMap.namedItem("y").nodeValue().toFloat());
vector2D.setX(germanLocale->toFloat(nodeMap.namedItem("x").nodeValue()));
vector2D.setY(germanLocale->toFloat(nodeMap.namedItem("y").nodeValue()));
return vector2D;
}