diff options
Diffstat (limited to 'code/AssetLib/DXF')
-rw-r--r-- | code/AssetLib/DXF/DXFHelper.h | 29 | ||||
-rw-r--r-- | code/AssetLib/DXF/DXFLoader.cpp | 6 | ||||
-rw-r--r-- | code/AssetLib/DXF/DXFLoader.h | 4 |
3 files changed, 14 insertions, 25 deletions
diff --git a/code/AssetLib/DXF/DXFHelper.h b/code/AssetLib/DXF/DXFHelper.h index 0bbecdc9e..1626ee922 100644 --- a/code/AssetLib/DXF/DXFHelper.h +++ b/code/AssetLib/DXF/DXFHelper.h @@ -2,8 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team - +Copyright (c) 2006-2025, assimp team All rights reserved. @@ -62,10 +61,7 @@ namespace DXF { // do NOT skip empty lines. In DXF files, they count as valid data. class LineReader { public: - LineReader(StreamReaderLE& reader) - : splitter(reader,false,true) - , groupcode( 0 ) - , end() { + LineReader(StreamReaderLE& reader) : splitter(reader,false,true), groupcode( 0 ), end() { // empty } @@ -165,8 +161,7 @@ private: // represents a POLYLINE or a LWPOLYLINE. or even a 3DFACE The data is converted as needed. struct PolyLine { - PolyLine() - : flags() { + PolyLine() : flags() { // empty } @@ -182,10 +177,7 @@ struct PolyLine { // reference to a BLOCK. Specifies its own coordinate system. struct InsertBlock { - InsertBlock() - : pos() - , scale(1.f,1.f,1.f) - , angle() { + InsertBlock() : pos(0.f, 0.f, 0.f), scale(1.f,1.f,1.f), angle(0.0f) { // empty } @@ -198,8 +190,7 @@ struct InsertBlock { // keeps track of all geometry in a single BLOCK. -struct Block -{ +struct Block { std::vector< std::shared_ptr<PolyLine> > lines; std::vector<InsertBlock> insertions; @@ -207,14 +198,12 @@ struct Block aiVector3D base; }; - -struct FileData -{ +struct FileData { // note: the LAST block always contains the stuff from ENTITIES. std::vector<Block> blocks; }; -} -} // Namespace Assimp +} // namespace DXF +} // namespace Assimp -#endif +#endif // INCLUDED_DXFHELPER_H diff --git a/code/AssetLib/DXF/DXFLoader.cpp b/code/AssetLib/DXF/DXFLoader.cpp index 0f3da2626..213dce2b6 100644 --- a/code/AssetLib/DXF/DXFLoader.cpp +++ b/code/AssetLib/DXF/DXFLoader.cpp @@ -3,7 +3,7 @@ Open Asset Import Library (assimp) --------------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team +Copyright (c) 2006-2025, assimp team All rights reserved. @@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef ASSIMP_BUILD_NO_DXF_IMPORTER -#include "AssetLib/DXF/DXFLoader.h" -#include "AssetLib/DXF/DXFHelper.h" +#include "DXFLoader.h" +#include "DXFHelper.h" #include "PostProcessing/ConvertToLHProcess.h" #include <assimp/ParsingUtils.h> diff --git a/code/AssetLib/DXF/DXFLoader.h b/code/AssetLib/DXF/DXFLoader.h index 9230bccbd..8cc798fbc 100644 --- a/code/AssetLib/DXF/DXFLoader.h +++ b/code/AssetLib/DXF/DXFLoader.h @@ -2,7 +2,7 @@ Open Asset Import Library (assimp) ---------------------------------------------------------------------- -Copyright (c) 2006-2024, assimp team +Copyright (c) 2006-2025, assimp team All rights reserved. @@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <assimp/BaseImporter.h> #include <map> -namespace Assimp { +namespace Assimp { // Forward declarations namespace DXF { |