Removes XMLBinaryWriter from CrySystem

Signed-off-by: Esteban Papp <[email protected]>

Code/Legacy/CrySystem/XML/XMLBinaryWriter.cpp

@@ -1,284 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#include <platform.h>
-#include "XMLBinaryWriter.h"
-#include "CryEndian.h"
-#include <string.h>  // memcpy()
-
-//////////////////////////////////////////////////////////////////////////
-XMLBinary::CXMLBinaryWriter::CXMLBinaryWriter()
-{
-    m_nStringDataSize = 0;
-}
-
-static void align(size_t& nPosition, const size_t nAlignment)
-{
-    const size_t nPadSize = ((nPosition + (nAlignment - 1)) & ~(nAlignment - 1)) - nPosition;
-    nPosition += nPadSize;
-}
-
-static void alignWrite(XMLBinary::IDataWriter* const pFile, size_t& nPosition, const size_t nAlignment)
-{
-    size_t nPadSize = ((nPosition + (nAlignment - 1)) & ~(nAlignment - 1)) - nPosition;
-
-    if (nPadSize > 0)
-    {
-        nPosition += nPadSize;
-
-        static const char zeroes[32] = { 0 };
-
-        while (nPadSize > 0)
-        {
-            const size_t n = (nPadSize <= sizeof(zeroes)) ? nPadSize : sizeof(zeroes);
-            nPadSize -= n;
-            pFile->Write(zeroes, n);
-        }
-    }
-}
-
-static void write(XMLBinary::IDataWriter* const pFile, size_t& nPosition, const void* const pData, const size_t nDataSize)
-{
-    pFile->Write(pData, nDataSize);
-    nPosition += nDataSize;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool XMLBinary::CXMLBinaryWriter::WriteNode(IDataWriter* pFile, XmlNodeRef node, XMLBinary::IFilter* pFilter, AZStd::string& error)
-{
-    error = "";
-
-    // Scan the node tree, building a flat node list, attribute list and string table.
-    m_nStringDataSize = 0;
-
-    if (!CompileTables(node, pFilter, error))
-    {
-        return false;
-    }
-
-    static const uint nMaxNodeCount = (NodeIndex) ~0;
-    if (m_nodes.size() > nMaxNodeCount)
-    {
-        error = AZStd::string::format("XMLBinary: Too many nodes: %zu (max is %i)", m_nodes.size(), nMaxNodeCount);
-        return false;
-    }
-
-    // Initialize the file header.
-    size_t nTheoreticalPosition = 0;
-    static const size_t nAlignment = sizeof(uint32);
-
-    BinaryFileHeader header;
-    static const char signature[] = "CryXmlB";
-    static_assert(sizeof(signature) == sizeof(header.szSignature));
-    memcpy(header.szSignature, signature, sizeof(header.szSignature));
-    nTheoreticalPosition += sizeof(header);
-    align(nTheoreticalPosition, nAlignment);
-
-    header.nNodeTablePosition = static_cast<uint32>(nTheoreticalPosition);
-    header.nNodeCount = int(m_nodes.size());
-    nTheoreticalPosition += header.nNodeCount * sizeof(Node);
-    align(nTheoreticalPosition, nAlignment);
-
-    header.nChildTablePosition = static_cast<uint32>(nTheoreticalPosition);
-    header.nChildCount = int(m_childs.size());
-    nTheoreticalPosition += header.nChildCount * sizeof(NodeIndex);
-    align(nTheoreticalPosition, nAlignment);
-
-    header.nAttributeTablePosition = static_cast<uint32>(nTheoreticalPosition);
-    header.nAttributeCount = int(m_attributes.size());
-    nTheoreticalPosition += header.nAttributeCount * sizeof(Attribute);
-    align(nTheoreticalPosition, nAlignment);
-
-    header.nStringDataPosition = static_cast<uint32>(nTheoreticalPosition);
-    header.nStringDataSize = m_nStringDataSize;
-    nTheoreticalPosition += header.nStringDataSize;
-
-    header.nXMLSize = static_cast<uint32>(nTheoreticalPosition);
-
-    // Write file
-    {
-        nTheoreticalPosition = 0;
-
-        // Write out the file header.
-        write(pFile, nTheoreticalPosition, &header, sizeof(header));
-        alignWrite(pFile, nTheoreticalPosition, nAlignment);
-
-        // Write out the node table.
-        if (!m_nodes.empty())
-        {
-            write(pFile, nTheoreticalPosition, &m_nodes[0], sizeof(m_nodes[0]) * m_nodes.size());
-            alignWrite(pFile, nTheoreticalPosition, nAlignment);
-        }
-
-        // Write out the children table.
-        if (!m_childs.empty())
-        {
-            write(pFile, nTheoreticalPosition, &m_childs[0], sizeof(m_childs[0]) * m_childs.size());
-            alignWrite(pFile, nTheoreticalPosition, nAlignment);
-        }
-
-        // Write out the attribute table.
-        if (!m_attributes.empty())
-        {
-            write(pFile, nTheoreticalPosition, &m_attributes[0], sizeof(m_attributes[0]) * m_attributes.size());
-            alignWrite(pFile, nTheoreticalPosition, nAlignment);
-        }
-
-        // Write out the data of all the m_strings.
-        for (size_t nString = 0; nString < m_strings.size(); ++nString)
-        {
-            pFile->Write(m_strings[nString].c_str(), m_strings[nString].size() + 1);
-        }
-    }
-
-    return true;
-}
-
-bool XMLBinary::CXMLBinaryWriter::CompileTables(XmlNodeRef node, XMLBinary::IFilter* pFilter, AZStd::string& error)
-{
-    bool ok = CompileTablesForNode(node, -1, pFilter, error);
-    ok = ok && CompileChildTable(node, pFilter, error);
-    return ok;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool XMLBinary::CXMLBinaryWriter::CompileTablesForNode(XmlNodeRef node, int nParentIndex, XMLBinary::IFilter* pFilter, AZStd::string& error)
-{
-    // Add the tag to the string table.
-    int nTagStringOffset = AddString(node->getTag());
-
-    // Add the content string to the string table.
-    int nContentStringOffset = AddString(node->getContent());
-
-    // Add all the attributes to the attributes table.
-    const char* szKey;
-    const char* szValue;
-    const int nFirstAttributeIndex = int(m_attributes.size());
-    for (int i = 0, attrCount = node->getNumAttributes(); i < attrCount; ++i)
-    {
-        if (node->getAttributeByIndex(i, &szKey, &szValue) &&
-            (!pFilter || pFilter->IsAccepted(IFilter::eType_AttributeName, szKey)))
-        {
-            // Add the key and the value to the string table.
-            Attribute attribute;
-            attribute.nKeyStringOffset = AddString(szKey);
-            attribute.nValueStringOffset = AddString(szValue);
-
-            // Add the attribute to the attribute table.
-            m_attributes.push_back(attribute);
-        }
-    }
-    const int nAttributeCount = int(m_attributes.size()) - nFirstAttributeIndex;
-
-    static const int nMaxAttributeCount = (uint16) ~0;
-    if (nAttributeCount > nMaxAttributeCount)
-    {
-        error = AZStd::string::format("XMLBinary: Too many attributes in a node: %d (max is %i)", nAttributeCount, nMaxAttributeCount);
-        return false;
-    }
-
-    // Add ourselves to the node list.
-    const int nIndex = int(m_nodes.size());
-    {
-        Node nd;
-        memset(&nd, 0, sizeof(nd));
-        nd.nTagStringOffset = nTagStringOffset;
-        nd.nContentStringOffset = nContentStringOffset;
-        nd.nParentIndex = nParentIndex;
-        nd.nFirstAttributeIndex = nFirstAttributeIndex;
-        nd.nAttributeCount = static_cast<uint16>(nAttributeCount);
-
-        m_nodes.push_back(nd);
-    }
-
-    m_nodesMap.insert(NodesMap::value_type(node, nIndex));
-
-    // Recurse to the child nodes.
-    int nChildCount = 0;
-    static const int nMaxChildCount = (uint16) ~0;
-    for (int nChild = 0, numChilds = node->getChildCount(); nChild < numChilds; ++nChild)
-    {
-        XmlNodeRef childNode = node->getChild(nChild);
-        if (!pFilter || pFilter->IsAccepted(IFilter::eType_ElementName, childNode->getTag()))
-        {
-            if (++nChildCount > nMaxChildCount)
-            {
-                error = AZStd::string::format("XMLBinary: Too many children in node '%s': %d (max is %i)", childNode->getTag(), nChildCount, nMaxChildCount);
-                return false;
-            }
-            if (!CompileTablesForNode(childNode, nIndex, pFilter, error))
-            {
-                return false;
-            }
-        }
-    }
-
-    m_nodes[nIndex].nChildCount = static_cast<uint16>(nChildCount);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-bool XMLBinary::CXMLBinaryWriter::CompileChildTable(XmlNodeRef node, XMLBinary::IFilter* pFilter, AZStd::string& error)
-{
-    const int nIndex = m_nodesMap.find(node)->second; // Assume node always exist in map.
-    const int nFirstChildIndex = (int)m_childs.size();
-
-    Node& nd = m_nodes[nIndex];
-    nd.nFirstChildIndex = nFirstChildIndex;
-
-    int nChildCount = 0;
-    for (int nChild = 0, numChilds = node->getChildCount(); nChild < numChilds; ++nChild)
-    {
-        XmlNodeRef childNode = node->getChild(nChild);
-        if (!pFilter || pFilter->IsAccepted(IFilter::eType_ElementName, childNode->getTag()))
-        {
-            ++nChildCount;
-            const int nChildIndex = m_nodesMap.find(childNode)->second; // Assume node always exist in map.
-            m_childs.push_back(nChildIndex);
-        }
-    }
-    if (nChildCount != nd.nChildCount)
-    {
-        error = AZStd::string::format("XMLBinary: Internal error in CompileChildTable()");
-        return false;
-    }
-
-    // Recurse to the child nodes.
-    for (int nChild = 0, numChilds = node->getChildCount(); nChild < numChilds; ++nChild)
-    {
-        XmlNodeRef childNode = node->getChild(nChild);
-        if (!pFilter || pFilter->IsAccepted(IFilter::eType_ElementName, childNode->getTag()))
-        {
-            if (!CompileChildTable(childNode, pFilter, error))
-            {
-                return false;
-            }
-        }
-    }
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-int XMLBinary::CXMLBinaryWriter::AddString(const XmlString& sString)
-{
-    // If we have such string already, then we will re-use its data.
-    StringMap::const_iterator itStringEntry = m_stringMap.find(sString);
-    if (itStringEntry == m_stringMap.end())
-    {
-        // We don't have such string yet, so we should add it to the tables.
-        m_strings.push_back(sString);
-        itStringEntry = m_stringMap.insert(StringMap::value_type(sString, m_nStringDataSize)).first;
-        m_nStringDataSize += static_cast<uint>(sString.length() + 1);
-    }
-
-    // Return offset of the string in the string data buffer.
-    return (*itStringEntry).second;
-}

Code/Legacy/CrySystem/XML/XMLBinaryWriter.h

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYWRITER_H
-#define CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYWRITER_H
-#pragma once
-
-
-#include "IXml.h"
-#include "XMLBinaryHeaders.h"
-#include <vector>
-#include <map>
-
-class IXMLDataSink;
-
-namespace XMLBinary
-{
-    class CXMLBinaryWriter
-    {
-    public:
-        CXMLBinaryWriter();
-        bool WriteNode(IDataWriter* pFile, XmlNodeRef node, XMLBinary::IFilter* pFilter, AZStd::string & error);
-
-    private:
-        bool CompileTables(XmlNodeRef node, XMLBinary::IFilter* pFilter, AZStd::string& error);
-
-        bool CompileTablesForNode(XmlNodeRef node, int nParentIndex, XMLBinary::IFilter* pFilter, AZStd::string& error);
-        bool CompileChildTable(XmlNodeRef node, XMLBinary::IFilter* pFilter, AZStd::string& error);
-        int AddString(const XmlString& sString);
-
-    private:
-        // tables.
-        typedef std::map<IXmlNode*, int> NodesMap;
-        typedef std::map<AZStd::string, uint> StringMap;
-
-        std::vector<Node> m_nodes;
-        NodesMap m_nodesMap;
-        std::vector<Attribute> m_attributes;
-        std::vector<NodeIndex> m_childs;
-        std::vector<AZStd::string> m_strings;
-        StringMap m_stringMap;
-
-        uint m_nStringDataSize;
-    };
-}
-
-#endif // CRYINCLUDE_CRYSYSTEM_XML_XMLBINARYWRITER_H

Code/Legacy/CrySystem/XML/XmlUtils.cpp

@@ -16,7 +16,6 @@
 #include "SerializeXMLReader.h"
 #include "SerializeXMLWriter.h"
 
-#include "XMLBinaryWriter.h"
 #include "XMLBinaryReader.h"
 
 #include <md5.h>

Code/Legacy/CrySystem/XML/crysystem_xmlbinary_files.cmake

@@ -11,6 +11,4 @@ set(FILES
     XMLBinaryNode.h
     XMLBinaryReader.cpp
     XMLBinaryReader.h
-    XMLBinaryWriter.cpp
-    XMLBinaryWriter.h
 )