AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 02:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Major scoped-enum refactor

Browse Source
This commit is contained in:
Jack Andersen
2015-11-20 15:16:07 -10:00
parent 4c09ded013
commit e423db32ee
83 changed files with 958 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
DataSpec/DNAMP1/MREA.hpp
View File

@@ -38,19 +38,19 @@ struct MREA
{
DECL_DNA
Value<atUint32> flags;
enum ThermalLevel
enum class ThermalLevel
{
ThermalCool,
ThermalHot,
ThermalWarm
Cool,
Hot,
Warm
};
static const char* GetThermalLevelStr(ThermalLevel t)
{
switch (t)
{
case ThermalCool: return "COOL";
case ThermalHot: return "HOT";
case ThermalWarm: return "WARM";
case ThermalLevel::Cool: return "COOL";
case ThermalLevel::Hot: return "HOT";
case ThermalLevel::Warm: return "WARM";
default: break;
}
return nullptr;
@@ -62,7 +62,7 @@ struct MREA
bool disableXray() const {return flags >> 3 & 0x1;}
void setDisableXray(bool v) {flags &= ~0x8; flags |= v << 3;}
ThermalLevel thermalLevel() const {return ThermalLevel(flags >> 4 & 0x3);}
void setThermalLevel(ThermalLevel v) {flags &= ~0x30; flags |= v << 4;}
void setThermalLevel(ThermalLevel v) {flags &= ~0x30; flags |= atUint32(v) << 4;}
const char* thermalLevelStr() const {return GetThermalLevelStr(thermalLevel());}
} visorFlags;
Value<atVec4f> xfMtx[3];
@@ -72,20 +72,20 @@ struct MREA
struct BabeDeadLight : BigDNA
{
DECL_DNA
enum LightType : atUint32
enum class LightType : atUint32
{
LightLocalAmbient,
LightDirectional,
LightCustom,
LightSpot,
LightSpot2,
LightLocalAmbient2
LocalAmbient,
Directional,
Custom,
Spot,
Spot2,
LocalAmbient2
};
enum Falloff : atUint32
enum class Falloff : atUint32
{
FalloffConstant,
FalloffLinear,
FalloffQuadratic
Constant,
Linear,
Quadratic
};
Value<LightType> lightType;
Value<atVec3f> color;