Invoke vsproject.py automatically and make newelement.py a bit more f…

…riendly

generator.py

@@ -234,3 +234,6 @@ class {0}: public SimTool
 
 generateElements(os.listdir("src/simulation/elements"), "generated/ElementClasses.cpp", "generated/ElementClasses.h")
 generateTools(os.listdir("src/simulation/simtools"), "generated/ToolClasses.cpp", "generated/ToolClasses.h")
+
+with open("vsproject.py") as f:
+	exec(compile(f.read(), "vsproject.py", 'exec'))

newelement.py

@@ -3,9 +3,13 @@
 import os
 
 if len(sys.argv) != 2:
-	sys.exit('needs an element name as an argument')
+	name = input('element name: ')
+else:
+	name = sys.argv[1]
+
+if re.search('[^A-Z0-9-]', name):
+	sys.exit('element names should only contain uppercase letters, numbers and hyphens (you can change the Name property of the element to whatever later though, which is what shows up in menus)')
 
-name = sys.argv[1].upper()
 path = 'src/simulation/elements/' + name + '.cpp'
 
 if os.path.isfile(path):
@@ -23,6 +27,7 @@
 
 with open(path, 'w') as elem:
 	elem.write(r"""#include "simulation/ElementCommon.h"
+
 //#TPT-Directive ElementClass Element_{0} PT_{0} {1}
 Element_{0}::Element_{0}()
 {{

vsproject.py

@@ -15,8 +15,7 @@
 			source_dirs.add(os.path.dirname(file))
 
 sln = open('The-Powder-Toy.sln', 'w')
-sln.write(r"""
-Microsoft Visual Studio Solution File, Format Version 12.00
+sln.write(r"""Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.40629.0
 MinimumVisualStudioVersion = 10.0.40219.1