Merge branch 'master' into MusicalProgrammer

2018-10-29 14:33:27 -04:00
parent f2347970c4 ab242470b6
commit 33a43c5072
25 changed files with 1417 additions and 161 deletions
--- a/Enum.h
+++ b/Enum.h
@@ -1,3 +1,5 @@
+#pragma once
+
 namespace Enum
 {
 	namespace SurfaceType
@@ -6,4 +8,10 @@ namespace Enum
 			Smooth, Bumps, Welds, Glue
 		};
 	}
+	namespace Shape
+	{
+		enum Value {
+			Block, Sphere, Cylinder
+		};
+	}
 }