Ticket #1771: no_preview_shadows_05222013.patch

source/graphics/Model.cpp

@@ -602 +602 @@
             m_Props[i].m_Model->ToCModel()->AddFlagsRec(flags);
 }
 
+void CModel::RemoveShadowsRec()
+{
+    m_Flags &= ~MODELFLAG_CASTSHADOWS;
+
+    m_Material.AddShaderDefine("DISABLE_RECEIVE_SHADOWS", "1");
+
+    for (size_t i = 0; i < m_Props.size(); ++i)
+        if (m_Props[i].m_Model->ToCModel())
+            m_Props[i].m_Model->ToCModel()->RemoveShadowsRec();
+}
+
 void CModel::SetMaterial(const CMaterial &material)
 {
     m_Material = material;

source/graphics/Model.h

@@ -118 +118 @@
     int GetFlags() const { return m_Flags; }
     // add object flags, recursively through props
     void AddFlagsRec(int flags);
+    // remove shadow casting and receiving, recursively through props
+    void RemoveShadowsRec();
 
     // recurse down tree setting dirty bits
     virtual void SetDirtyRec(int dirtyflags) {

source/simulation2/components/CCmpTemplateManager.cpp

@@ -525 +525 @@
     if (out.GetChild("Entity").GetChild("Obstruction").IsOk())
         CParamNode::LoadXMLString(out, "<Entity><Obstruction><Active>false</Active></Obstruction></Entity>");
 
+    if (out.GetChild("Entity").GetChild("VisualActor").IsOk())
+        CParamNode::LoadXMLString(out, "<Entity><VisualActor><DisableShadows/></VisualActor></Entity>");
+
     if (!corpse)
     {
         // Previews should always be visible in fog-of-war/etc

source/simulation2/components/CCmpVisualActor.cpp

@@ -117 +117 @@
                     "<empty/>"
                 "</element>"
             "</optional>"
+            "<optional>"
+                "<element name='DisableShadows' a:help='Used internally; if present, shadows will be disabled'>"
+                    "<empty/>"
+                "</element>"
+            "</optional>"
             "<element name='SilhouetteDisplay'>"
                 "<data type='boolean'/>"
             "</element>"
@@ -535 +540 @@
 
                 if (paramNode.GetChild("SilhouetteDisplay").ToBool())
                     modelFlags |= MODELFLAG_SILHOUETTE_DISPLAY;
-
                 if (paramNode.GetChild("SilhouetteOccluder").ToBool())
                     modelFlags |= MODELFLAG_SILHOUETTE_OCCLUDER;
 
@@ -544 +548 @@
                     modelFlags |= MODELFLAG_IGNORE_LOS;
 
                 model.ToCModel()->AddFlagsRec(modelFlags);
+
+                if (paramNode.GetChild("DisableShadows").IsOk())
+                    model.ToCModel()->RemoveShadowsRec();
             }
 
             // Initialize the model's selection shape descriptor. This currently relies on the component initialization order; the