C5Sign is now not runnable - use C5Sign-[no]pygame instead

4 files changed, 37 insertions, 18 deletions

diff --git a/config/C5Sign-nopygame.xml b/config/C5Sign-nopygame.xml
new file mode 100644
index 0000000..1844ef5
--- /dev/null
+++ b/config/C5Sign-nopygame.xml
@@ -0,0 +1,5 @@
+<LightInstallation>
+    <InheritsFrom>config/C5Sign.xml</InheritsFrom>
+    <RendererConfiguration> </RendererConfiguration>
+    <InputConfiguration> </InputConfiguration>
+</LightInstallation>
diff --git a/config/C5Sign-pygame.xml b/config/C5Sign-pygame.xml
new file mode 100644
index 0000000..2040642
--- /dev/null
+++ b/config/C5Sign-pygame.xml
@@ -0,0 +1,18 @@
+<LightInstallation>
+    <RendererConfiguration>
+        <Renderer Scale="5">
+            <InheritsFrom>renderers/Pygame.xml</InheritsFrom>
+        </Renderer>
+    </RendererConfiguration>
+    <InputConfiguration>
+        <InputElement>
+            <Class>inputs.PygameInput</Class>
+            <Args>
+                <Id>pygamekey</Id>
+                <RefreshInterval>10</RefreshInterval>
+                <Keyboard>True</Keyboard>
+            </Args>
+        </InputElement>
+    </InputConfiguration>
+    <InheritsFrom>config/C5Sign.xml</InheritsFrom>
+</LightInstallation>
diff --git a/config/C5Sign.xml b/config/C5Sign.xml
index 77f6bcc..8039c07 100644
--- a/config/C5Sign.xml
+++ b/config/C5Sign.xml
@@ -35,20 +35,19 @@
         </PixelMapper>
     </PixelMapperConfiguration>
     <RendererConfiguration>
-        <Renderer>
+        <APPEND><Renderer>
             <InheritsFrom>renderers/C5Renderer.xml</InheritsFrom>
-        </Renderer>
-        <Renderer Scale="5">
-            <InheritsFrom>renderers/Pygame.xml</InheritsFrom>
-        </Renderer>
+        </Renderer></APPEND>
     </RendererConfiguration>
     <InputConfiguration>
-        <InputElement>
-            <Class>inputs.ContinuousLocationInput</Class>
+        <APPEND><InputElement>
+            <Class>inputs.ParametricLocationInput</Class>
             <Args>
                 <Id>centerleft</Id>
                 <xloc>left</xloc>
                 <yloc>center</yloc>
+                <xEquation>0</xEquation>
+                <yEquation>.5</yEquation>
                 <RefreshInterval>1800</RefreshInterval>
             </Args>
         </InputElement>
@@ -61,14 +60,6 @@
             </Args>
         </InputElement>
         <InputElement>
-            <Class>inputs.PygameInput</Class>
-            <Args>
-                <Id>pygamekey</Id>
-                <RefreshInterval>10</RefreshInterval>
-                <Keyboard>True</Keyboard>
-            </Args>
-        </InputElement>
-        <InputElement>
             <Class>inputs.UDPInput</Class>
             <Args>
                 <Id>udp</Id>
@@ -82,7 +73,7 @@
                 <Id>center</Id>
                 <RefreshInterval>700</RefreshInterval>
             </Args>
-        </InputElement>
+        </InputElement></APPEND>
     </InputConfiguration>
     <BehaviorConfiguration>
         <Behavior>
diff --git a/inputs/ParametricLocationInput.py b/inputs/ParametricLocationInput.py
index f413c64..e817a9d 100644
--- a/inputs/ParametricLocationInput.py
+++ b/inputs/ParametricLocationInput.py
@@ -3,8 +3,13 @@ import util.ComponentRegistry as compReg
 import util.Strings as Strings
 from operationscore.Input import *
 class ParametricLocationInput(Input):
-    '''Continuously returns one of nine positions on the screen as specified by the xloc
-    and yloc arguments, which can take values 'min', 'max', and 'center'. '''
+    """Takes three arguments: xEquation, yEquation, and useClock where
+        xEquation and yEquation is a parametric equation in t and returns
+        a value from 0 to 1, where 0 represents top/left and 1 represents
+        bottom/right of the lightscreen. useClock is a boolean that 
+        specifies if the behavior should compute t based on the system
+        clock (value True) or should just increment t every time the
+        input is called."""
 
     def clockTick(self):
         return clock.time() - clock.t