Added new way of dealing with enums

This commit is contained in:
andreja6
2018-10-23 19:42:42 -07:00
parent ebbbbb3a69
commit 7f7e015706
4 changed files with 27 additions and 14 deletions

9
Enum.h Normal file
View File

@@ -0,0 +1,9 @@
namespace Enum
{
namespace SurfaceType
{
enum Value {
Smooth, Bumps, Welds, Glue
};
}
}

View File

@@ -363,6 +363,10 @@
RelativePath=".\Demo.h"
>
</File>
<File
RelativePath=".\Enum.h"
>
</File>
<File
RelativePath=".\Enums.h"
>

View File

@@ -13,12 +13,12 @@ PhysicalInstance::PhysicalInstance(void)
color = Color3::gray();
velocity = Vector3(0,0,0);
rotVelocity = Vector3(0,0,0);
top = Smooth;
front = Smooth;
right = Smooth;
back = Smooth;
left = Smooth;
bottom = Smooth;
top = Enum::SurfaceType::Smooth;
front = Enum::SurfaceType::Smooth;
right = Enum::SurfaceType::Smooth;
back = Enum::SurfaceType::Smooth;
left = Enum::SurfaceType::Smooth;
bottom = Enum::SurfaceType::Smooth;
}
PhysicalInstance::PhysicalInstance(const PhysicalInstance &oinst)
@@ -149,7 +149,7 @@ void PhysicalInstance::render(RenderDevice* rd)
for(int i = 0; i < 96; i+=16)
{
double add = 0.8;
SurfaceType face;
Enum::SurfaceType::Value face;
if(i == 0)//Back
face = back;
else if(i == 16)//Right

View File

@@ -1,6 +1,6 @@
#pragma once
#include "instance.h"
#include "Enums.h"
#include "Enum.h"
class PhysicalInstance :
public Instance
@@ -12,12 +12,12 @@ public:
~PhysicalInstance(void);
virtual void render(RenderDevice*);
Vector3 velocity;
SurfaceType top;
SurfaceType front;
SurfaceType right;
SurfaceType back;
SurfaceType left;
SurfaceType bottom;
Enum::SurfaceType::Value top;
Enum::SurfaceType::Value front;
Enum::SurfaceType::Value right;
Enum::SurfaceType::Value back;
Enum::SurfaceType::Value left;
Enum::SurfaceType::Value bottom;
CoordinateFrame cFrame;
Color3 color;
Vector3 getPosition();