Merge branch 'master' into issue-5438
Stephen Gold
GitHub
commit
329f53adb3
|
|
@ -3,7 +3,7 @@
|
|||
Open Asset Import Library (assimp)
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
Copyright (c) 2006-2022, assimp team
|
||||
Copyright (c) 2006-2024, assimp team
|
||||
|
||||
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
|
||||
*/
|
||||
|
||||
|
||||
#ifndef ASSIMP_BUILD_NO_DXF_IMPORTER
|
||||
|
||||
#include "AssetLib/DXF/DXFLoader.h"
|
||||
|
|
@ -68,25 +67,267 @@ static constexpr size_t AI_DXF_BINARY_IDENT_LEN = sizeof AI_DXF_BINARY_IDENT;
|
|||
// default vertex color that all uncolored vertices will receive
|
||||
static const aiColor4D AI_DXF_DEFAULT_COLOR(aiColor4D(0.6f, 0.6f, 0.6f, 0.6f));
|
||||
|
||||
// color indices for DXF - 16 are supported, the table is
|
||||
// taken directly from the DXF spec.
|
||||
static const aiColor4D g_aclrDxfIndexColors[] = {
|
||||
aiColor4D(0.6f, 0.6f, 0.6f, 1.0f),
|
||||
aiColor4D (1.0f, 0.0f, 0.0f, 1.0f), // red
|
||||
aiColor4D (0.0f, 1.0f, 0.0f, 1.0f), // green
|
||||
aiColor4D (0.0f, 0.0f, 1.0f, 1.0f), // blue
|
||||
aiColor4D (0.3f, 1.0f, 0.3f, 1.0f), // light green
|
||||
aiColor4D (0.3f, 0.3f, 1.0f, 1.0f), // light blue
|
||||
aiColor4D (1.0f, 0.3f, 0.3f, 1.0f), // light red
|
||||
aiColor4D (1.0f, 0.0f, 1.0f, 1.0f), // pink
|
||||
aiColor4D (1.0f, 0.6f, 0.0f, 1.0f), // orange
|
||||
aiColor4D (0.6f, 0.3f, 0.0f, 1.0f), // dark orange
|
||||
aiColor4D (1.0f, 1.0f, 0.0f, 1.0f), // yellow
|
||||
aiColor4D (0.3f, 0.3f, 0.3f, 1.0f), // dark gray
|
||||
aiColor4D (0.8f, 0.8f, 0.8f, 1.0f), // light gray
|
||||
aiColor4D (0.0f, 00.f, 0.0f, 1.0f), // black
|
||||
aiColor4D (1.0f, 1.0f, 1.0f, 1.0f), // white
|
||||
aiColor4D (0.6f, 0.0f, 1.0f, 1.0f) // violet
|
||||
// color indices for DXF - 256 are supported, the table is
|
||||
// taken directly from the AutoCad Index (ACI) table
|
||||
// https://gohtx.com/acadcolors.php
|
||||
//STH 2024-0126
|
||||
static const aiColor4D g_aclrDxfIndexColors[256] = {
|
||||
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, 1.0f ,0.0f, 1.0f), //dxf color code 2
|
||||
aiColor4D (0.0f, 1.0f ,0.0f, 1.0f), //dxf color code 3
|
||||
aiColor4D (0.0f, 1.0f ,1.0f, 1.0f), //dxf color code 4
|
||||
aiColor4D (0.0f, 0.0f ,1.0f, 1.0f), //dxf color code 5
|
||||
aiColor4D (1.0f, 0.0f ,1.0f, 1.0f), //dxf color code 6
|
||||
aiColor4D (1.0f, 1.0f ,1.0f, 1.0f), //dxf color code 7
|
||||
aiColor4D (0.3f, 0.3f ,0.3f, 1.0f), //dxf color code 8
|
||||
aiColor4D (0.5f, 0.5f ,0.5f, 1.0f), //dxf color code 9
|
||||
aiColor4D (1.0f, 0.0f ,0.0f, 1.0f), //dxf color code 10
|
||||
aiColor4D (1.0f, 0.7f ,0.7f, 1.0f), //dxf color code 11
|
||||
aiColor4D (0.7f, 0.0f ,0.0f, 1.0f), //dxf color code 12
|
||||
aiColor4D (0.7f, 0.5f ,0.5f, 1.0f), //dxf color code 13
|
||||
aiColor4D (0.5f, 0.0f ,0.0f, 1.0f), //dxf color code 14
|
||||
aiColor4D (0.5f, 0.3f ,0.3f, 1.0f), //dxf color code 15
|
||||
aiColor4D (0.4f, 0.0f ,0.0f, 1.0f), //dxf color code 16
|
||||
aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 17
|
||||
aiColor4D (0.3f, 0.0f ,0.0f, 1.0f), //dxf color code 18
|
||||
aiColor4D (0.3f, 0.2f ,0.2f, 1.0f), //dxf color code 19
|
||||
aiColor4D (1.0f, 0.2f ,0.0f, 1.0f), //dxf color code 20
|
||||
aiColor4D (1.0f, 0.7f ,0.7f, 1.0f), //dxf color code 21
|
||||
aiColor4D (0.7f, 0.2f ,0.0f, 1.0f), //dxf color code 22
|
||||
aiColor4D (0.7f, 0.6f ,0.5f, 1.0f), //dxf color code 23
|
||||
aiColor4D (0.5f, 0.1f ,0.0f, 1.0f), //dxf color code 24
|
||||
aiColor4D (0.5f, 0.4f ,0.3f, 1.0f), //dxf color code 25
|
||||
aiColor4D (0.4f, 0.1f ,0.0f, 1.0f), //dxf color code 26
|
||||
aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 27
|
||||
aiColor4D (0.3f, 0.1f ,0.0f, 1.0f), //dxf color code 28
|
||||
aiColor4D (0.3f, 0.2f ,0.2f, 1.0f), //dxf color code 29
|
||||
aiColor4D (1.0f, 0.5f ,0.0f, 1.0f), //dxf color code 30
|
||||
aiColor4D (1.0f, 0.8f ,0.7f, 1.0f), //dxf color code 31
|
||||
aiColor4D (0.7f, 0.4f ,0.0f, 1.0f), //dxf color code 32
|
||||
aiColor4D (0.7f, 0.6f ,0.5f, 1.0f), //dxf color code 33
|
||||
aiColor4D (0.5f, 0.3f ,0.0f, 1.0f), //dxf color code 34
|
||||
aiColor4D (0.5f, 0.4f ,0.3f, 1.0f), //dxf color code 35
|
||||
aiColor4D (0.4f, 0.2f ,0.0f, 1.0f), //dxf color code 36
|
||||
aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 37
|
||||
aiColor4D (0.3f, 0.2f ,0.0f, 1.0f), //dxf color code 38
|
||||
aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 39
|
||||
aiColor4D (1.0f, 0.7f ,0.0f, 1.0f), //dxf color code 40
|
||||
aiColor4D (1.0f, 0.9f ,0.7f, 1.0f), //dxf color code 41
|
||||
aiColor4D (0.7f, 0.6f ,0.0f, 1.0f), //dxf color code 42
|
||||
aiColor4D (0.7f, 0.7f ,0.5f, 1.0f), //dxf color code 43
|
||||
aiColor4D (0.5f, 0.4f ,0.0f, 1.0f), //dxf color code 44
|
||||
aiColor4D (0.5f, 0.5f ,0.3f, 1.0f), //dxf color code 45
|
||||
aiColor4D (0.4f, 0.3f ,0.0f, 1.0f), //dxf color code 46
|
||||
aiColor4D (0.4f, 0.4f ,0.3f, 1.0f), //dxf color code 47
|
||||
aiColor4D (0.3f, 0.2f ,0.0f, 1.0f), //dxf color code 48
|
||||
aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 49
|
||||
aiColor4D (1.0f, 1.0f ,0.0f, 1.0f), //dxf color code 50
|
||||
aiColor4D (1.0f, 1.0f ,0.7f, 1.0f), //dxf color code 51
|
||||
aiColor4D (0.7f, 0.7f ,0.0f, 1.0f), //dxf color code 52
|
||||
aiColor4D (0.7f, 0.7f ,0.5f, 1.0f), //dxf color code 53
|
||||
aiColor4D (0.5f, 0.5f ,0.0f, 1.0f), //dxf color code 54
|
||||
aiColor4D (0.5f, 0.5f ,0.3f, 1.0f), //dxf color code 55
|
||||
aiColor4D (0.4f, 0.4f ,0.0f, 1.0f), //dxf color code 56
|
||||
aiColor4D (0.4f, 0.4f ,0.3f, 1.0f), //dxf color code 57
|
||||
aiColor4D (0.3f, 0.3f ,0.0f, 1.0f), //dxf color code 58
|
||||
aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 59
|
||||
aiColor4D (0.7f, 1.0f ,0.0f, 1.0f), //dxf color code 60
|
||||
aiColor4D (0.9f, 1.0f ,0.7f, 1.0f), //dxf color code 61
|
||||
aiColor4D (0.6f, 0.7f ,0.0f, 1.0f), //dxf color code 62
|
||||
aiColor4D (0.7f, 0.7f ,0.5f, 1.0f), //dxf color code 63
|
||||
aiColor4D (0.4f, 0.5f ,0.0f, 1.0f), //dxf color code 64
|
||||
aiColor4D (0.5f, 0.5f ,0.3f, 1.0f), //dxf color code 65
|
||||
aiColor4D (0.3f, 0.4f ,0.0f, 1.0f), //dxf color code 66
|
||||
aiColor4D (0.4f, 0.4f ,0.3f, 1.0f), //dxf color code 67
|
||||
aiColor4D (0.2f, 0.3f ,0.0f, 1.0f), //dxf color code 68
|
||||
aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 69
|
||||
aiColor4D (0.5f, 1.0f ,0.0f, 1.0f), //dxf color code 70
|
||||
aiColor4D (0.8f, 1.0f ,0.7f, 1.0f), //dxf color code 71
|
||||
aiColor4D (0.4f, 0.7f ,0.0f, 1.0f), //dxf color code 72
|
||||
aiColor4D (0.6f, 0.7f ,0.5f, 1.0f), //dxf color code 73
|
||||
aiColor4D (0.3f, 0.5f ,0.0f, 1.0f), //dxf color code 74
|
||||
aiColor4D (0.4f, 0.5f ,0.3f, 1.0f), //dxf color code 75
|
||||
aiColor4D (0.2f, 0.4f ,0.0f, 1.0f), //dxf color code 76
|
||||
aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 77
|
||||
aiColor4D (0.2f, 0.3f ,0.0f, 1.0f), //dxf color code 78
|
||||
aiColor4D (0.3f, 0.3f ,0.2f, 1.0f), //dxf color code 79
|
||||
aiColor4D (0.2f, 1.0f ,0.0f, 1.0f), //dxf color code 80
|
||||
aiColor4D (0.7f, 1.0f ,0.7f, 1.0f), //dxf color code 81
|
||||
aiColor4D (0.2f, 0.7f ,0.0f, 1.0f), //dxf color code 82
|
||||
aiColor4D (0.6f, 0.7f ,0.5f, 1.0f), //dxf color code 83
|
||||
aiColor4D (0.1f, 0.5f ,0.0f, 1.0f), //dxf color code 84
|
||||
aiColor4D (0.4f, 0.5f ,0.3f, 1.0f), //dxf color code 85
|
||||
aiColor4D (0.1f, 0.4f ,0.0f, 1.0f), //dxf color code 86
|
||||
aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 87
|
||||
aiColor4D (0.1f, 0.3f ,0.0f, 1.0f), //dxf color code 88
|
||||
aiColor4D (0.2f, 0.3f ,0.2f, 1.0f), //dxf color code 89
|
||||
aiColor4D (0.0f, 1.0f ,0.0f, 1.0f), //dxf color code 90
|
||||
aiColor4D (0.7f, 1.0f ,0.7f, 1.0f), //dxf color code 91
|
||||
aiColor4D (0.0f, 0.7f ,0.0f, 1.0f), //dxf color code 92
|
||||
aiColor4D (0.5f, 0.7f ,0.5f, 1.0f), //dxf color code 93
|
||||
aiColor4D (0.0f, 0.5f ,0.0f, 1.0f), //dxf color code 94
|
||||
aiColor4D (0.3f, 0.5f ,0.3f, 1.0f), //dxf color code 95
|
||||
aiColor4D (0.0f, 0.4f ,0.0f, 1.0f), //dxf color code 96
|
||||
aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 97
|
||||
aiColor4D (0.0f, 0.3f ,0.0f, 1.0f), //dxf color code 98
|
||||
aiColor4D (0.2f, 0.3f ,0.2f, 1.0f), //dxf color code 99
|
||||
aiColor4D (0.0f, 1.0f ,0.2f, 1.0f), //dxf color code 100
|
||||
aiColor4D (0.7f, 1.0f ,0.7f, 1.0f), //dxf color code 101
|
||||
aiColor4D (0.0f, 0.7f ,0.2f, 1.0f), //dxf color code 102
|
||||
aiColor4D (0.5f, 0.7f ,0.6f, 1.0f), //dxf color code 103
|
||||
aiColor4D (0.0f, 0.5f ,0.1f, 1.0f), //dxf color code 104
|
||||
aiColor4D (0.3f, 0.5f ,0.4f, 1.0f), //dxf color code 105
|
||||
aiColor4D (0.0f, 0.4f ,0.1f, 1.0f), //dxf color code 106
|
||||
aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 107
|
||||
aiColor4D (0.0f, 0.3f ,0.1f, 1.0f), //dxf color code 108
|
||||
aiColor4D (0.2f, 0.3f ,0.2f, 1.0f), //dxf color code 109
|
||||
aiColor4D (0.0f, 1.0f ,0.5f, 1.0f), //dxf color code 110
|
||||
aiColor4D (0.7f, 1.0f ,0.8f, 1.0f), //dxf color code 111
|
||||
aiColor4D (0.0f, 0.7f ,0.4f, 1.0f), //dxf color code 112
|
||||
aiColor4D (0.5f, 0.7f ,0.6f, 1.0f), //dxf color code 113
|
||||
aiColor4D (0.0f, 0.5f ,0.3f, 1.0f), //dxf color code 114
|
||||
aiColor4D (0.3f, 0.5f ,0.4f, 1.0f), //dxf color code 115
|
||||
aiColor4D (0.0f, 0.4f ,0.2f, 1.0f), //dxf color code 116
|
||||
aiColor4D (0.3f, 0.4f ,0.3f, 1.0f), //dxf color code 117
|
||||
aiColor4D (0.0f, 0.3f ,0.2f, 1.0f), //dxf color code 118
|
||||
aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 119
|
||||
aiColor4D (0.0f, 1.0f ,0.7f, 1.0f), //dxf color code 120
|
||||
aiColor4D (0.7f, 1.0f ,0.9f, 1.0f), //dxf color code 121
|
||||
aiColor4D (0.0f, 0.7f ,0.6f, 1.0f), //dxf color code 122
|
||||
aiColor4D (0.5f, 0.7f ,0.7f, 1.0f), //dxf color code 123
|
||||
aiColor4D (0.0f, 0.5f ,0.4f, 1.0f), //dxf color code 124
|
||||
aiColor4D (0.3f, 0.5f ,0.5f, 1.0f), //dxf color code 125
|
||||
aiColor4D (0.0f, 0.4f ,0.3f, 1.0f), //dxf color code 126
|
||||
aiColor4D (0.3f, 0.4f ,0.4f, 1.0f), //dxf color code 127
|
||||
aiColor4D (0.0f, 0.3f ,0.2f, 1.0f), //dxf color code 128
|
||||
aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 129
|
||||
aiColor4D (0.0f, 1.0f ,1.0f, 1.0f), //dxf color code 130
|
||||
aiColor4D (0.7f, 1.0f ,1.0f, 1.0f), //dxf color code 131
|
||||
aiColor4D (0.0f, 0.7f ,0.7f, 1.0f), //dxf color code 132
|
||||
aiColor4D (0.5f, 0.7f ,0.7f, 1.0f), //dxf color code 133
|
||||
aiColor4D (0.0f, 0.5f ,0.5f, 1.0f), //dxf color code 134
|
||||
aiColor4D (0.3f, 0.5f ,0.5f, 1.0f), //dxf color code 135
|
||||
aiColor4D (0.0f, 0.4f ,0.4f, 1.0f), //dxf color code 136
|
||||
aiColor4D (0.3f, 0.4f ,0.4f, 1.0f), //dxf color code 137
|
||||
aiColor4D (0.0f, 0.3f ,0.3f, 1.0f), //dxf color code 138
|
||||
aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 139
|
||||
aiColor4D (0.0f, 0.7f ,1.0f, 1.0f), //dxf color code 140
|
||||
aiColor4D (0.7f, 0.9f ,1.0f, 1.0f), //dxf color code 141
|
||||
aiColor4D (0.0f, 0.6f ,0.7f, 1.0f), //dxf color code 142
|
||||
aiColor4D (0.5f, 0.7f ,0.7f, 1.0f), //dxf color code 143
|
||||
aiColor4D (0.0f, 0.4f ,0.5f, 1.0f), //dxf color code 144
|
||||
aiColor4D (0.3f, 0.5f ,0.5f, 1.0f), //dxf color code 145
|
||||
aiColor4D (0.0f, 0.3f ,0.4f, 1.0f), //dxf color code 146
|
||||
aiColor4D (0.3f, 0.4f ,0.4f, 1.0f), //dxf color code 147
|
||||
aiColor4D (0.0f, 0.2f ,0.3f, 1.0f), //dxf color code 148
|
||||
aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 149
|
||||
aiColor4D (0.0f, 0.5f ,1.0f, 1.0f), //dxf color code 150
|
||||
aiColor4D (0.7f, 0.8f ,1.0f, 1.0f), //dxf color code 151
|
||||
aiColor4D (0.0f, 0.4f ,0.7f, 1.0f), //dxf color code 152
|
||||
aiColor4D (0.5f, 0.6f ,0.7f, 1.0f), //dxf color code 153
|
||||
aiColor4D (0.0f, 0.3f ,0.5f, 1.0f), //dxf color code 154
|
||||
aiColor4D (0.3f, 0.4f ,0.5f, 1.0f), //dxf color code 155
|
||||
aiColor4D (0.0f, 0.2f ,0.4f, 1.0f), //dxf color code 156
|
||||
aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 157
|
||||
aiColor4D (0.0f, 0.2f ,0.3f, 1.0f), //dxf color code 158
|
||||
aiColor4D (0.2f, 0.3f ,0.3f, 1.0f), //dxf color code 159
|
||||
aiColor4D (0.0f, 0.2f ,1.0f, 1.0f), //dxf color code 160
|
||||
aiColor4D (0.7f, 0.7f ,1.0f, 1.0f), //dxf color code 161
|
||||
aiColor4D (0.0f, 0.2f ,0.7f, 1.0f), //dxf color code 162
|
||||
aiColor4D (0.5f, 0.6f ,0.7f, 1.0f), //dxf color code 163
|
||||
aiColor4D (0.0f, 0.1f ,0.5f, 1.0f), //dxf color code 164
|
||||
aiColor4D (0.3f, 0.4f ,0.5f, 1.0f), //dxf color code 165
|
||||
aiColor4D (0.0f, 0.1f ,0.4f, 1.0f), //dxf color code 166
|
||||
aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 167
|
||||
aiColor4D (0.0f, 0.1f ,0.3f, 1.0f), //dxf color code 168
|
||||
aiColor4D (0.2f, 0.2f ,0.3f, 1.0f), //dxf color code 169
|
||||
aiColor4D (0.0f, 0.0f ,1.0f, 1.0f), //dxf color code 170
|
||||
aiColor4D (0.7f, 0.7f ,1.0f, 1.0f), //dxf color code 171
|
||||
aiColor4D (0.0f, 0.0f ,0.7f, 1.0f), //dxf color code 172
|
||||
aiColor4D (0.5f, 0.5f ,0.7f, 1.0f), //dxf color code 173
|
||||
aiColor4D (0.0f, 0.0f ,0.5f, 1.0f), //dxf color code 174
|
||||
aiColor4D (0.3f, 0.3f ,0.5f, 1.0f), //dxf color code 175
|
||||
aiColor4D (0.0f, 0.0f ,0.4f, 1.0f), //dxf color code 176
|
||||
aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 177
|
||||
aiColor4D (0.0f, 0.0f ,0.3f, 1.0f), //dxf color code 178
|
||||
aiColor4D (0.2f, 0.2f ,0.3f, 1.0f), //dxf color code 179
|
||||
aiColor4D (0.2f, 0.0f ,1.0f, 1.0f), //dxf color code 180
|
||||
aiColor4D (0.7f, 0.7f ,1.0f, 1.0f), //dxf color code 181
|
||||
aiColor4D (0.2f, 0.0f ,0.7f, 1.0f), //dxf color code 182
|
||||
aiColor4D (0.6f, 0.5f ,0.7f, 1.0f), //dxf color code 183
|
||||
aiColor4D (0.1f, 0.0f ,0.5f, 1.0f), //dxf color code 184
|
||||
aiColor4D (0.4f, 0.3f ,0.5f, 1.0f), //dxf color code 185
|
||||
aiColor4D (0.1f, 0.0f ,0.4f, 1.0f), //dxf color code 186
|
||||
aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 187
|
||||
aiColor4D (0.1f, 0.0f ,0.3f, 1.0f), //dxf color code 188
|
||||
aiColor4D (0.2f, 0.2f ,0.3f, 1.0f), //dxf color code 189
|
||||
aiColor4D (0.5f, 0.0f ,1.0f, 1.0f), //dxf color code 190
|
||||
aiColor4D (0.8f, 0.7f ,1.0f, 1.0f), //dxf color code 191
|
||||
aiColor4D (0.4f, 0.0f ,0.7f, 1.0f), //dxf color code 192
|
||||
aiColor4D (0.6f, 0.5f ,0.7f, 1.0f), //dxf color code 193
|
||||
aiColor4D (0.3f, 0.0f ,0.5f, 1.0f), //dxf color code 194
|
||||
aiColor4D (0.4f, 0.3f ,0.5f, 1.0f), //dxf color code 195
|
||||
aiColor4D (0.2f, 0.0f ,0.4f, 1.0f), //dxf color code 196
|
||||
aiColor4D (0.3f, 0.3f ,0.4f, 1.0f), //dxf color code 197
|
||||
aiColor4D (0.2f, 0.0f ,0.3f, 1.0f), //dxf color code 198
|
||||
aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 199
|
||||
aiColor4D (0.7f, 0.0f ,1.0f, 1.0f), //dxf color code 200
|
||||
aiColor4D (0.9f, 0.7f ,1.0f, 1.0f), //dxf color code 201
|
||||
aiColor4D (0.6f, 0.0f ,0.7f, 1.0f), //dxf color code 202
|
||||
aiColor4D (0.7f, 0.5f ,0.7f, 1.0f), //dxf color code 203
|
||||
aiColor4D (0.4f, 0.0f ,0.5f, 1.0f), //dxf color code 204
|
||||
aiColor4D (0.5f, 0.3f ,0.5f, 1.0f), //dxf color code 205
|
||||
aiColor4D (0.3f, 0.0f ,0.4f, 1.0f), //dxf color code 206
|
||||
aiColor4D (0.4f, 0.3f ,0.4f, 1.0f), //dxf color code 207
|
||||
aiColor4D (0.2f, 0.0f ,0.3f, 1.0f), //dxf color code 208
|
||||
aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 209
|
||||
aiColor4D (1.0f, 0.0f ,1.0f, 1.0f), //dxf color code 210
|
||||
aiColor4D (1.0f, 0.7f ,1.0f, 1.0f), //dxf color code 211
|
||||
aiColor4D (0.7f, 0.0f ,0.7f, 1.0f), //dxf color code 212
|
||||
aiColor4D (0.7f, 0.5f ,0.7f, 1.0f), //dxf color code 213
|
||||
aiColor4D (0.5f, 0.0f ,0.5f, 1.0f), //dxf color code 214
|
||||
aiColor4D (0.5f, 0.3f ,0.5f, 1.0f), //dxf color code 215
|
||||
aiColor4D (0.4f, 0.0f ,0.4f, 1.0f), //dxf color code 216
|
||||
aiColor4D (0.4f, 0.3f ,0.4f, 1.0f), //dxf color code 217
|
||||
aiColor4D (0.3f, 0.0f ,0.3f, 1.0f), //dxf color code 218
|
||||
aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 219
|
||||
aiColor4D (1.0f, 0.0f ,0.7f, 1.0f), //dxf color code 220
|
||||
aiColor4D (1.0f, 0.7f ,0.9f, 1.0f), //dxf color code 221
|
||||
aiColor4D (0.7f, 0.0f ,0.6f, 1.0f), //dxf color code 222
|
||||
aiColor4D (0.7f, 0.5f ,0.7f, 1.0f), //dxf color code 223
|
||||
aiColor4D (0.5f, 0.0f ,0.4f, 1.0f), //dxf color code 224
|
||||
aiColor4D (0.5f, 0.3f ,0.5f, 1.0f), //dxf color code 225
|
||||
aiColor4D (0.4f, 0.0f ,0.3f, 1.0f), //dxf color code 226
|
||||
aiColor4D (0.4f, 0.3f ,0.4f, 1.0f), //dxf color code 227
|
||||
aiColor4D (0.3f, 0.0f ,0.2f, 1.0f), //dxf color code 228
|
||||
aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 229
|
||||
aiColor4D (1.0f, 0.0f ,0.5f, 1.0f), //dxf color code 230
|
||||
aiColor4D (1.0f, 0.7f ,0.8f, 1.0f), //dxf color code 231
|
||||
aiColor4D (0.7f, 0.0f ,0.4f, 1.0f), //dxf color code 232
|
||||
aiColor4D (0.7f, 0.5f ,0.6f, 1.0f), //dxf color code 233
|
||||
aiColor4D (0.5f, 0.0f ,0.3f, 1.0f), //dxf color code 234
|
||||
aiColor4D (0.5f, 0.3f ,0.4f, 1.0f), //dxf color code 235
|
||||
aiColor4D (0.4f, 0.0f ,0.2f, 1.0f), //dxf color code 236
|
||||
aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 237
|
||||
aiColor4D (0.3f, 0.0f ,0.2f, 1.0f), //dxf color code 238
|
||||
aiColor4D (0.3f, 0.2f ,0.3f, 1.0f), //dxf color code 239
|
||||
aiColor4D (1.0f, 0.0f ,0.2f, 1.0f), //dxf color code 240
|
||||
aiColor4D (1.0f, 0.7f ,0.7f, 1.0f), //dxf color code 241
|
||||
aiColor4D (0.7f, 0.0f ,0.2f, 1.0f), //dxf color code 242
|
||||
aiColor4D (0.7f, 0.5f ,0.6f, 1.0f), //dxf color code 243
|
||||
aiColor4D (0.5f, 0.0f ,0.1f, 1.0f), //dxf color code 244
|
||||
aiColor4D (0.5f, 0.3f ,0.4f, 1.0f), //dxf color code 245
|
||||
aiColor4D (0.4f, 0.0f ,0.1f, 1.0f), //dxf color code 246
|
||||
aiColor4D (0.4f, 0.3f ,0.3f, 1.0f), //dxf color code 247
|
||||
aiColor4D (0.3f, 0.0f ,0.1f, 1.0f), //dxf color code 248
|
||||
aiColor4D (0.3f, 0.2f ,0.2f, 1.0f), //dxf color code 249
|
||||
aiColor4D (0.2f, 0.2f ,0.2f, 1.0f), //dxf color code 250
|
||||
aiColor4D (0.3f, 0.3f ,0.3f, 1.0f), //dxf color code 251
|
||||
aiColor4D (0.4f, 0.4f ,0.4f, 1.0f), //dxf color code 252
|
||||
aiColor4D (0.5f, 0.5f ,0.5f, 1.0f), //dxf color code 253
|
||||
aiColor4D (0.7f, 0.7f ,0.7f, 1.0f), //dxf color code 254
|
||||
aiColor4D (1.0f, 1.0f ,1.0f, 1.0f) //dxf color code 255
|
||||
};
|
||||
|
||||
#define AI_DXF_NUM_INDEX_COLORS (sizeof(g_aclrDxfIndexColors)/sizeof(g_aclrDxfIndexColors[0]))
|
||||
|
|
@ -372,8 +613,12 @@ void DXFImporter::ExpandBlockReferences(DXF::Block& bl,const DXF::BlockMap& bloc
|
|||
// XXX order
|
||||
aiMatrix4x4 trafo, tmp;
|
||||
aiMatrix4x4::Translation(-bl_src.base,trafo);
|
||||
trafo *= aiMatrix4x4::Scaling(insert.scale,tmp);
|
||||
//Need to translate position before scaling the insert
|
||||
//otherwise the position ends up being the position*scaling
|
||||
//STH 2024.01.17
|
||||
trafo *= aiMatrix4x4::Translation(insert.pos,tmp);
|
||||
trafo *= aiMatrix4x4::Scaling(insert.scale,tmp);
|
||||
//trafo *= aiMatrix4x4::Translation(insert.pos,tmp);
|
||||
|
||||
// XXX rotation currently ignored - I didn't find an appropriate sample model.
|
||||
if (insert.angle != 0.f) {
|
||||
|
|
|
|||
|
|
@ -1807,7 +1807,7 @@ void FBXExporter::WriteObjects ()
|
|||
p.AddP70numberA("DeformPercent", 0.0);
|
||||
sdnode.AddChild(p);
|
||||
// TODO: Normally just one weight per channel, adding stub for later development
|
||||
std::vector<float>fFullWeights;
|
||||
std::vector<double>fFullWeights;
|
||||
fFullWeights.push_back(100.);
|
||||
sdnode.AddChild("FullWeights", fFullWeights);
|
||||
sdnode.Dump(outstream, binary, indent);
|
||||
|
|
|
|||
|
|
@ -64,10 +64,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
|
||||
The list can be regenerated using the following:
|
||||
|
||||
cat <path/to/stb/stb_image.h> | fgrep STBIDEF | fgrep '(' | sed -E 's/\*|\(.+//g' | \
|
||||
awk '{print "#define " $(NF) " assimp_" $(NF) }' | sort | uniq"
|
||||
cat "path/to/stb/stb_image.h" | fgrep STBIDEF | fgrep '(' | sed -E 's/\*|\(.+//g' | \
|
||||
awk '{print "#define " $(NF) " assimp_" $(NF) }' | sort | uniq
|
||||
*/
|
||||
#define stbi_convert_iphone_png_to_rgb assimp_stbi_convert_iphone_png_to_rgb
|
||||
#define stbi_convert_iphone_png_to_rgb_thread assimp_stbi_convert_iphone_png_to_rgb_thread
|
||||
#define stbi_convert_wchar_to_utf8 assimp_stbi_convert_wchar_to_utf8
|
||||
#define stbi_failure_reason assimp_stbi_failure_reason
|
||||
#define stbi_hdr_to_ldr_gamma assimp_stbi_hdr_to_ldr_gamma
|
||||
|
|
@ -87,22 +88,23 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
#define stbi_is_hdr_from_memory assimp_stbi_is_hdr_from_memory
|
||||
#define stbi_ldr_to_hdr_gamma assimp_stbi_ldr_to_hdr_gamma
|
||||
#define stbi_ldr_to_hdr_scale assimp_stbi_ldr_to_hdr_scale
|
||||
#define stbi_load assimp_stbi_load
|
||||
#define stbi_load_16 assimp_stbi_load_16
|
||||
#define stbi_load_16_from_callbacks assimp_stbi_load_16_from_callbacks
|
||||
#define stbi_load_16_from_memory assimp_stbi_load_16_from_memory
|
||||
#define stbi_load assimp_stbi_load
|
||||
#define stbi_load_from_callbacks assimp_stbi_load_from_callbacks
|
||||
#define stbi_load_from_file assimp_stbi_load_from_file
|
||||
#define stbi_load_from_file_16 assimp_stbi_load_from_file_16
|
||||
#define stbi_load_from_memory assimp_stbi_load_from_memory
|
||||
#define stbi_load_gif_from_memory assimp_stbi_load_gif_from_memory
|
||||
#define stbi_loadf assimp_stbi_loadf
|
||||
#define stbi_loadf_from_callbacks assimp_stbi_loadf_from_callbacks
|
||||
#define stbi_loadf_from_file assimp_stbi_loadf_from_file
|
||||
#define stbi_loadf_from_memory assimp_stbi_loadf_from_memory
|
||||
#define stbi_load_from_callbacks assimp_stbi_load_from_callbacks
|
||||
#define stbi_load_from_file_16 assimp_stbi_load_from_file_16
|
||||
#define stbi_load_from_file assimp_stbi_load_from_file
|
||||
#define stbi_load_from_memory assimp_stbi_load_from_memory
|
||||
#define stbi_load_gif_from_memory assimp_stbi_load_gif_from_memory
|
||||
#define stbi_set_flip_vertically_on_load assimp_stbi_set_flip_vertically_on_load
|
||||
#define stbi_set_flip_vertically_on_load_thread assimp_stbi_set_flip_vertically_on_load_thread
|
||||
#define stbi_set_unpremultiply_on_load assimp_stbi_set_unpremultiply_on_load
|
||||
#define stbi_set_unpremultiply_on_load_thread assimp_stbi_set_unpremultiply_on_load_thread
|
||||
#define stbi_zlib_decode_buffer assimp_stbi_zlib_decode_buffer
|
||||
#define stbi_zlib_decode_malloc assimp_stbi_zlib_decode_malloc
|
||||
#define stbi_zlib_decode_malloc_guesssize assimp_stbi_zlib_decode_malloc_guesssize
|
||||
|
|
|
|||
Loading…
Reference in New Issue