v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update DXFLoader.cpp 

- Use constexpr instead of const.
pull/5436/head^2
Kim Kulling 2024-01-27 11:13:48 +01:00
parent 8cde65bfe8
commit c6fe03f7a5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/AssetLib/DXF/DXFLoader.cpp
View File

@ -3,7 +3,7 @@
Open Asset Import Library (assimp) Open Asset Import Library (assimp)
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
Copyright (c) 2006-2022, assimp team Copyright (c) 2006-2024, assimp team
All rights reserved. All rights reserved.
@ -43,7 +43,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* @brief Implementation of the DXF importer class * @brief Implementation of the DXF importer class
*/ */
#ifndef ASSIMP_BUILD_NO_DXF_IMPORTER #ifndef ASSIMP_BUILD_NO_DXF_IMPORTER
#include "AssetLib/DXF/DXFLoader.h" #include "AssetLib/DXF/DXFLoader.h"
@ -72,7 +71,7 @@ static const aiColor4D AI_DXF_DEFAULT_COLOR(aiColor4D(0.6f, 0.6f, 0.6f, 0.6f));
// taken directly from the AutoCad Index (ACI) table // taken directly from the AutoCad Index (ACI) table
// https://gohtx.com/acadcolors.php // https://gohtx.com/acadcolors.php
//STH 2024-0126 //STH 2024-0126
static const aiColor4D g_aclrDxfIndexColors[] = { static constexpr aiColor4D g_aclrDxfIndexColors[256] = {
aiColor4D (0.0f, 0.0f ,0.0f, 1.0f), //dxf color code 0 aiColor4D (0.0f, 0.0f ,0.0f, 1.0f), //dxf color code 0
aiColor4D (1.0f, 0.0f ,0.0f, 1.0f), //dxf color code 1 aiColor4D (1.0f, 0.0f ,0.0f, 1.0f), //dxf color code 1
aiColor4D (1.0f, 1.0f ,0.0f, 1.0f), //dxf color code 2 aiColor4D (1.0f, 1.0f ,0.0f, 1.0f), //dxf color code 2