Ticket #143: receiveshadows_r11037_02072012.patch

source/graphics/Model.cpp

@@ -462 +462 @@
     if (source->m_Flags & MODELFLAG_CASTSHADOWS)
         m_Flags |= MODELFLAG_CASTSHADOWS;
 
+    m_Flags &= ~MODELFLAG_RECEIVESHADOWS;
+    if (source->m_Flags & MODELFLAG_RECEIVESHADOWS)
+        m_Flags |= MODELFLAG_RECEIVESHADOWS;
+
     m_ObjectBounds.SetEmpty();
     InvalidateBounds();
 }

source/graphics/Model.h

@@ -36 +36 @@
 class CSkeletonAnimDef;
 class CSkeletonAnimManager;
 
-#define MODELFLAG_CASTSHADOWS       (1<<0)
-#define MODELFLAG_NOLOOPANIMATION   (1<<1)
-#define MODELFLAG_SILHOUETTE_DISPLAY    (1<<2)
-#define MODELFLAG_SILHOUETTE_OCCLUDER   (1<<3)
-#define MODELFLAG_FILTERED          (1<<4)  // used internally by renderer
+#define MODELFLAG_CASTSHADOWS           (1<<0)
+#define MODELFLAG_RECEIVESHADOWS        (1<<1)
+#define MODELFLAG_NOLOOPANIMATION       (1<<2)
+#define MODELFLAG_SILHOUETTE_DISPLAY    (1<<3)
+#define MODELFLAG_SILHOUETTE_OCCLUDER   (1<<4)
+#define MODELFLAG_FILTERED              (1<<5)  // used internally by renderer
 
 ///////////////////////////////////////////////////////////////////////////////
 // CModel: basically, a mesh object - holds the texturing and skinning 

source/graphics/ObjectBase.cpp

@@ -34 +34 @@
 CObjectBase::CObjectBase(CObjectManager& objectManager)
 : m_ObjectManager(objectManager)
 {
-    m_Properties.m_CastShadows = true;
+    m_Properties.m_CastShadows = false;
+    m_Properties.m_ReceiveShadows = false;
     m_Properties.m_AutoFlatten = false;
     m_Properties.m_FloatOnWater = false;
 }
@@ -53 +54 @@
     #define AT(x) int at_##x = XeroFile.GetAttributeID(#x)
     EL(actor);
     EL(castshadow);
+    EL(receiveshadow);
     EL(float);
     EL(material);
     EL(group);
@@ -245 +247 @@
         }
         else if (child_name == el_castshadow)
         {
-            m_Properties.m_CastShadows = true; // TODO: this is the default, so it's a bit useless
+            m_Properties.m_CastShadows = true;
         }
+        else if (child_name == el_receiveshadow)
+        {
+            m_Properties.m_ReceiveShadows = true;
+        }
         else if (child_name == el_float)
         {
             m_Properties.m_FloatOnWater = true;

source/graphics/ObjectBase.h

@@ -147 +147 @@
         bool m_AutoFlatten;
         // cast shadows from this object
         bool m_CastShadows;
+        // this object receives shadows
+        bool m_ReceiveShadows;
         // float on top of water
         bool m_FloatOnWater;
     } m_Properties;

source/graphics/ObjectEntry.cpp

@@ -227 +227 @@
         model->SetFlags(model->GetFlags()|MODELFLAG_CASTSHADOWS);
     }
 
+    if (m_Base->m_Properties.m_ReceiveShadows)
+    {
+        model->SetFlags(model->GetFlags()|MODELFLAG_RECEIVESHADOWS);
+    }
+
     return true;
 }
 

source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp

@@ -73 +73 @@
     m_CastShadows = new wxCheckBox(propertiesPanel, wxID_ANY, _("Cast shadow"));
     propertiesSizer->Add(m_CastShadows, wxSizerFlags().Border(wxALL, 5));
 
+    m_ReceiveShadows = new wxCheckBox(propertiesPanel, wxID_ANY, _("Receive shadow"));
+    propertiesSizer->Add(m_ReceiveShadows, wxSizerFlags().Border(wxALL, 5));
+
     m_Float = new wxCheckBox(propertiesPanel, wxID_ANY, _("Float on water"));
     propertiesSizer->Add(m_Float, wxSizerFlags().Border(wxALL, 5));
 
@@ -107 +110 @@
     m_ActorEditorListCtrl->ThawData(actor);
 
     m_CastShadows->SetValue(actor["castshadow"].defined());
+    m_ReceiveShadows->SetValue(actor["receiveshadow"].defined());
     m_Float->SetValue(actor["float"].defined());
     m_Material->SetValue((wxString)actor["material"]);
 }
@@ -118 +122 @@
     if (m_CastShadows->IsChecked())
         actor.set("castshadow", L"");
 
+    if (m_ReceiveShadows->IsChecked())
+        actor.set("receiveshadow", L"");
+        
     if (m_Float->IsChecked())
         actor.set("float", L"");
 
@@ -173 +180 @@
 
         if (wxString(in["Object"]["Properties"]["@castshadows"]) == _T("1"))
             actor.add("castshadow", L"");
+            
+        if (wxString(in["Object"]["Properties"]["@receiveshadows"]) == _T("1"))
+            actor.add("receiveshadow", L"");
 
         // Things to strip leading strings (for converting filenames, since the
         // new format doesn't store the entire path)
@@ -247 +257 @@
         AtObj actor;
 
         if (in["actor"]["castshadow"].defined()) actor.add("castshadow", in["actor"]["castshadow"]);
+        if (in["actor"]["receiveshadow"].defined()) actor.add("receiveshadow", in["actor"]["receiveshadow"]);
         if (in["actor"]["material"].defined()) actor.add("material", in["actor"]["material"]);
 
         for (AtIter grpit = in["actor"]["group"]; grpit.defined(); ++grpit)
@@ -317 +328 @@
     m_ActorEditorListCtrl->ImportData(actor);
 
     m_CastShadows->SetValue(actor["castshadow"].defined());
+    m_ReceiveShadows->SetValue(actor["receiveshadow"].defined());
     m_Float->SetValue(actor["float"].defined());
     m_Material->SetValue((wxString)actor["material"]);
 }
@@ -330 +342 @@
 
     if (m_CastShadows->IsChecked())
         actor.set("castshadow", L"");
+        
+    if (m_ReceiveShadows->IsChecked())
+        actor.set("receiveshadow", L"");
 
     if (m_Float->IsChecked())
         actor.set("float", L"");

source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.h

@@ -48 +48 @@
     ActorEditorListCtrl* m_ActorEditorListCtrl;
 
     wxCheckBox* m_CastShadows;
+    wxCheckBox* m_ReceiveShadows;
     wxCheckBox* m_Float;
     wxComboBox* m_Material;