Clean up SCAN enum and pane lookup

Update hecl
This commit is contained in:
Phillip Stephens 2016-01-10 14:27:59 -08:00
parent f85ac8e88c
commit e35027ba17
2 changed files with 8 additions and 42 deletions

View File

@ -11,26 +11,10 @@ namespace DNAMP1
{
static const std::vector<std::string> PaneNames =
{
"imagepane_pane0",
"imagepane_pane1",
"imagepane_pane2",
"imagepane_pane3",
"imagepane_pane01",
"imagepane_pane12",
"imagepane_pane23",
"imagepane_pane012",
"imagepane_pane123",
"imagepane_pane0123",
"imagepane_pane4",
"imagepane_pane5",
"imagepane_pane6",
"imagepane_pane7",
"imagepane_pane45",
"imagepane_pane56",
"imagepane_pane67",
"imagepane_pane456",
"imagepane_pane567",
"imagepane_pane4567"
"imagepane_pane0", "imagepane_pane1", "imagepane_pane2", "imagepane_pane3", "imagepane_pane01",
"imagepane_pane12", "imagepane_pane23", "imagepane_pane012", "imagepane_pane123", "imagepane_pane0123",
"imagepane_pane4", "imagepane_pane5", "imagepane_pane6", "imagepane_pane7", "imagepane_pane45",
"imagepane_pane56", "imagepane_pane67", "imagepane_pane456", "imagepane_pane567", "imagepane_pane4567"
};
struct SCAN : BigYAML
@ -65,27 +49,9 @@ struct SCAN : BigYAML
Value<float> appearanceRange;
enum class Position : atInt32
{
Pane0,
Pane1,
Pane2,
Pane3,
Pane01,
Pane12,
Pane23,
Pane012,
Pane123,
Pane0123,
Pane4,
Pane5,
Pane6,
Pane7,
Pane45,
Pane56,
Pane67,
Pane456,
Pane567,
Pane4567,
Invalid = -1
Pane0, Pane1, Pane2, Pane3, Pane01, Pane12, Pane23, Pane012,
Pane123, Pane0123, Pane4, Pane5, Pane6, Pane7, Pane45, Pane56,
Pane67, Pane456, Pane567, Pane4567, Invalid = -1
};
Value<Position> position;
Value<atUint32> width; // width of animation cell

2
hecl

@ -1 +1 @@
Subproject commit fcedcb508e0f2c8edb4ad857738e1e664f2d6c95
Subproject commit 2179fb3e50e904a50e6b74a2bd994035fe16d38a