From 0aedeb61b4a0fee17ed5025cbdc20ab0edfe3881 Mon Sep 17 00:00:00 2001
From: verysecrethero <hnorthh@gmail.com>
Date: Fri, 11 Mar 2016 14:15:46 +0100
Subject: [PATCH] CapturePointSystem now sets all children visible/not visible
 for each red/blue/spectator

---
 assets                                        |   2 +-
 .../Entities/aim_rays_with_capturep.xml       | 110 +++++++++++++++++-
 src/Game/Systems/CapturePointSystem.cpp       |   9 +-
 3 files changed, 112 insertions(+), 9 deletions(-)

diff --git a/assets b/assets
index 007b54bd..33455a9d 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 007b54bd678d0e80af878bed457e33e73bc0834a
+Subproject commit 33455a9d10979b3041d7b8c026be4ac40b2ebad0
diff --git a/resources/Schema/Entities/aim_rays_with_capturep.xml b/resources/Schema/Entities/aim_rays_with_capturep.xml
index 3cf5a26a..60030ba5 100644
--- a/resources/Schema/Entities/aim_rays_with_capturep.xml
+++ b/resources/Schema/Entities/aim_rays_with_capturep.xml
@@ -13,6 +13,7 @@
         <c:Model>
           <Resource>models/core/unitcube.mesh</Resource>
           <Color A="1" B="0.980392158" G="1" R="1"/>
+          <Shadow>false</Shadow>
         </c:Model>
         <c:Transform>
           <Position X="-0.100000001" Y="0" Z="0"/>
@@ -28,6 +29,7 @@
         <c:Model>
           <Resource>models/core/unitcube.mesh</Resource>
           <Color A="1" B="0" G="0" R="1"/>
+          <Shadow>false</Shadow>
         </c:Model>
         <c:Transform>
           <Position X="-14.500001" Y="1.50000012" Z="16.9222012"/>
@@ -52,6 +54,7 @@
         <c:Model>
           <Resource>models/core/unitcube.mesh</Resource>
           <Color A="1" B="1" G="0" R="0"/>
+          <Shadow>false</Shadow>
         </c:Model>
         <c:Transform>
           <Position X="-14.500001" Y="1.50000012" Z="-17.6888409"/>
@@ -67,6 +70,7 @@
         <c:Model>
           <Resource>models/core/unitcube.mesh</Resource>
           <Color A="1" B="0" G="0" R="1"/>
+          <Shadow>false</Shadow>
         </c:Model>
         <c:Transform>
           <Position X="12.1000004" Y="1.50000012" Z="16.9222012"/>
@@ -82,6 +86,7 @@
         <c:Model>
           <Resource>models/core/unitcube.mesh</Resource>
           <Color A="1" B="1" G="0" R="0"/>
+          <Shadow>false</Shadow>
         </c:Model>
         <c:Transform>
           <Position X="12.1228638" Y="1.50000012" Z="-17.9642811"/>
@@ -198,6 +203,7 @@
         <c:Model>
           <Resource>models/core/unitcube.mesh</Resource>
           <Color A="1" B="39.2156868" G="0" R="3.13725495"/>
+          <Shadow>false</Shadow>
         </c:Model>
         <c:Transform>
           <Scale X="-70" Y="-70" Z="-70"/>
@@ -210,7 +216,7 @@
         <c:Transform/>
       </Components>
       <Children>
-        <Entity name="-">
+        <Entity name="CapP">
           <Components>
             <c:AABB/>
             <c:CapturePoint>
@@ -254,6 +260,13 @@
                   </Components>
                   <Children/>
                 </Entity>
+                <Entity>
+                  <Components>
+                    <c:PointLight/>
+                    <c:Transform/>
+                  </Components>
+                  <Children/>
+                </Entity>
               </Children>
             </Entity>
             <Entity name="Blue">
@@ -265,7 +278,25 @@
                   <Scale X="3.4000001" Y="4.70000029" Z="0.700000048"/>
                 </c:Transform>
               </Components>
-              <Children/>
+              <Children>
+                <Entity>
+                  <Components>
+                    <c:Model>
+                      <Resource></Resource>
+                    </c:Model>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity>
+                      <Components>
+                        <c:PointLight/>
+                        <c:Transform/>
+                      </Components>
+                      <Children/>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
             </Entity>
             <Entity name="Spectator">
               <Components>
@@ -276,7 +307,43 @@
                   <Scale X="1" Y="5.70000029" Z="1"/>
                 </c:Transform>
               </Components>
-              <Children/>
+              <Children>
+                <Entity>
+                  <Components>
+                    <c:PointLight/>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity>
+                      <Components>
+                        <c:Model>
+                          <Resource></Resource>
+                        </c:Model>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity>
+                          <Components>
+                            <c:PointLight/>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity>
+                              <Components>
+                                <c:Model>
+                                  <Resource></Resource>
+                                </c:Model>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
             </Entity>
           </Children>
         </Entity>
@@ -287,11 +354,11 @@
         <c:Transform/>
       </Components>
       <Children>
-        <Entity name="-">
+        <Entity name="CapP">
           <Components>
             <c:AABB/>
             <c:CapturePoint>
-              <CaptureTimer>-15</CaptureTimer>
+              <CaptureTimer>12</CaptureTimer>
               <HomePointForTeam>
                 <Blue/>
               </HomePointForTeam>
@@ -317,7 +384,38 @@
                   <Scale X="4.4000001" Y="2" Z="3.70000029"/>
                 </c:Transform>
               </Components>
-              <Children/>
+              <Children>
+                <Entity>
+                  <Components>
+                    <c:Model>
+                      <Resource></Resource>
+                    </c:Model>
+                    <c:Transform/>
+                  </Components>
+                  <Children>
+                    <Entity>
+                      <Components>
+                        <c:Transform/>
+                      </Components>
+                      <Children>
+                        <Entity>
+                          <Components>
+                            <c:Transform/>
+                          </Components>
+                          <Children>
+                            <Entity>
+                              <Components>
+                                <c:Transform/>
+                              </Components>
+                              <Children/>
+                            </Entity>
+                          </Children>
+                        </Entity>
+                      </Children>
+                    </Entity>
+                  </Children>
+                </Entity>
+              </Children>
             </Entity>
             <Entity name="Blue">
               <Components>
diff --git a/src/Game/Systems/CapturePointSystem.cpp b/src/Game/Systems/CapturePointSystem.cpp
index 13ac59f3..4a511301 100644
--- a/src/Game/Systems/CapturePointSystem.cpp
+++ b/src/Game/Systems/CapturePointSystem.cpp
@@ -234,9 +234,14 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
 
 void CapturePointSystem::ChangeCapturePointModelsVisibility(EntityWrapper &capturePointModels, bool isOwner) {
     (bool&)capturePointModels["Model"]["Visible"] = isOwner;
-    for (auto& capModel : capturePointModels.ChildrenWithComponent("Model"))
+    for (auto& capModel : capturePointModels.ChildrenWithComponent("Transform"))
     {
-        (bool&)capModel["Model"]["Visible"] = isOwner;
+        if (capModel.HasComponent("Model")) {
+            (bool&)capModel["Model"]["Visible"] = isOwner;
+        }
+        if (capModel.HasComponent("PointLight")) {
+            (bool&)capModel["PointLight"]["Visible"] = isOwner;
+        }
     }
 }