birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/Mission.cpp
-74
View File
@@ -51,10 +51,6 @@ CMission::CMission(CCryEditDoc* doc)
m_numCGFObjects = 0;
m_minimap.vCenter = Vec2(512, 512);
m_minimap.vExtends = Vec2(512, 512);
m_minimap.textureWidth = m_minimap.textureHeight = 1024;
m_reentrancyProtector = false;
}
@@ -85,10 +81,6 @@ void CMission::Serialize(CXmlArchive& ar, bool bParts)
ar.root->getAttr("Name", m_name);
ar.root->getAttr("Description", m_description);
//time_t time = 0;
//ar.root->getAttr( "Time",time );
//m_time = time;
XmlNodeRef objects = ar.root->findChild("Objects");
if (objects)
{
@@ -105,35 +97,13 @@ void CMission::Serialize(CXmlArchive& ar, bool bParts)
m_Animations = ar.root->findChild("MovieData");
/*
XmlNodeRef expData = ar.root->findChild( "ExportData" );
if (expData)
{
m_exportData = expData;
}
*/
SerializeEnvironment(ar);
XmlNodeRef minimapNode = ar.root->findChild("MiniMap");
if (minimapNode)
{
minimapNode->getAttr("CenterX", m_minimap.vCenter.x);
minimapNode->getAttr("CenterY", m_minimap.vCenter.y);
minimapNode->getAttr("ExtendsX", m_minimap.vExtends.x);
minimapNode->getAttr("ExtendsY", m_minimap.vExtends.y);
// minimapNode->getAttr( "CameraHeight",m_minimap.cameraHeight );
minimapNode->getAttr("TexWidth", m_minimap.textureWidth);
minimapNode->getAttr("TexHeight", m_minimap.textureHeight);
}
}
else
{
ar.root->setAttr("Name", m_name.toUtf8().data());
ar.root->setAttr("Description", m_description.toUtf8().data());
//time_t time = m_time.GetTime();
//ar.root->setAttr( "Time",time );
QString timeStr;
int nHour = floor(m_time);
int nMins = (m_time - floor(m_time)) * 60.0f;
@@ -154,15 +124,6 @@ void CMission::Serialize(CXmlArchive& ar, bool bParts)
SerializeTimeOfDay(ar);
SerializeEnvironment(ar);
}
XmlNodeRef minimapNode = ar.root->newChild("MiniMap");
minimapNode->setAttr("CenterX", m_minimap.vCenter.x);
minimapNode->setAttr("CenterY", m_minimap.vCenter.y);
minimapNode->setAttr("ExtendsX", m_minimap.vExtends.x);
minimapNode->setAttr("ExtendsY", m_minimap.vExtends.y);
// minimapNode->setAttr( "CameraHeight",m_minimap.cameraHeight );
minimapNode->setAttr("TexWidth", m_minimap.textureWidth);
minimapNode->setAttr("TexHeight", m_minimap.textureHeight);
}
}
@@ -190,15 +151,6 @@ void CMission::Export(XmlNodeRef& root, XmlNodeRef& objectsNode)
m_timeOfDay->setAttr("Time", m_time);
root->addChild(m_timeOfDay);
XmlNodeRef minimapNode = root->newChild("MiniMap");
minimapNode->setAttr("CenterX", m_minimap.vCenter.x);
minimapNode->setAttr("CenterY", m_minimap.vCenter.y);
minimapNode->setAttr("ExtendsX", m_minimap.vExtends.x);
minimapNode->setAttr("ExtendsY", m_minimap.vExtends.y);
// minimapNode->setAttr( "CameraHeight",m_minimap.cameraHeight );
minimapNode->setAttr("TexWidth", m_minimap.textureWidth);
minimapNode->setAttr("TexHeight", m_minimap.textureHeight);
IObjectManager* pObjMan = GetIEditor()->GetObjectManager();
//////////////////////////////////////////////////////////////////////////
@@ -211,19 +163,6 @@ void CMission::Export(XmlNodeRef& root, XmlNodeRef& objectsNode)
objectsNode = root->newChild("Objects");
pObjMan->Export(path, objectsNode, true); // Export shared.
pObjMan->Export(path, objectsNode, false); // Export not shared.
/*
CObjectManager objectManager;
XmlNodeRef loadRoot = root->createNode("Root");
loadRoot->addChild( m_objects );
std::vector<CObjectClassDesc*> classes;
GetIEditor()->GetObjectManager()->GetClasses( classes );
objectManager.SetClasses( classes );
objectManager.SetCreateGameObject(false);
objectManager.Serialize( loadRoot,true,SERIALIZE_ALL );
objectManager.Export( path,objects,false );
*/
}
//////////////////////////////////////////////////////////////////////////
@@ -321,13 +260,6 @@ void CMission::SetLayersNode(XmlNodeRef& node)
m_layers = node->clone();
}
//////////////////////////////////////////////////////////////////////////
void CMission::SetMinimap(const SMinimapInfo& minimap)
{
m_minimap = minimap;
}
//////////////////////////////////////////////////////////////////////////
void CMission::SaveParts()
{
@@ -427,9 +359,3 @@ void CMission::SerializeEnvironment(CXmlArchive& ar)
}
}
//////////////////////////////////////////////////////////////////////////
const SMinimapInfo& CMission::GetMinimap() const
{
return m_minimap;
}