From b02b461c2a6b94fa9b27d26bfa4918f39769363c Mon Sep 17 00:00:00 2001
From: rcoh <rcoh@mit.edu>
Date: Sun, 2 Jan 2011 10:23:48 -0500
Subject: Changed default mode of xml merging to merge instead of replace. 
 Added some syntactic sugar in xml file -- attributes on Class-Level items
 will be automatically added to their args dict.  This is designed for easy
 specification of Id etc. when you are Inheriting from another class.

---
 config/Outdoor.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'config/Outdoor.xml')

diff --git a/config/Outdoor.xml b/config/Outdoor.xml
index 8ba7962..cae610b 100644
--- a/config/Outdoor.xml
+++ b/config/Outdoor.xml
@@ -26,7 +26,12 @@
         </PixelMapper>
     </PixelMapperConfiguration>
     <RendererConfiguration>
-        <InheritsFrom>renderers/SixStripUDPPygame.xml</InheritsFrom>
+        <Renderer>
+            <InheritsFrom>renderers/SixStripUDP.xml</InheritsFrom>
+        </Renderer>
+        <Renderer>
+            <InheritsFrom>renderers/Pygame.xml</InheritsFrom>
+        </Renderer>
     </RendererConfiguration>
     <InputConfiguration>
         <InputElement>
@@ -36,7 +41,7 @@
                 <RefreshInterval>100</RefreshInterval>
             </Args>
         </InputElement>
-        <InputElement>
+        <InputElement Id="followmouse">
             <InheritsFrom>inputs/MouseFollower.xml</InheritsFrom>
         </InputElement>
     </InputConfiguration>
@@ -49,14 +54,14 @@
                 <RenderToScreen>False</RenderToScreen>
             </Args>
         </Behavior>
-        <Behavior>
+        <Behavior Id="colorchange">
             <Class>behaviors.ColorChangerBehavior</Class>
             <Args>
                 <Id>colorchange</Id>
                 <z-index>0</z-index>
                 <RenderToScreen>False</RenderToScreen>
             <!--<ColorList>
-                <Color>(255,0,0)</Color>
+                 <Color>(255,0,0)</Color>
             </ColorList>-->
                 <Inputs>
                     <Id>pygame</Id>
-- 
cgit v1.2.3