Ticket #3952: simulationVariations.diff

binaries/data/mods/public/art/actors/structures/hellenes/siege_tower.xml

@@ -17 +17 @@
     </variant>
   </group>
   <group>
-    <variant frequency="100" name="Idle"/>
+    <variant frequency="1" name="ungarrisoned"/>
     <variant name="garrisoned">
       <props>
         <prop actor="props/special/common/waypoint_flag_0ad.xml" attachpoint="garrisoned"/>
       </props>
     </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="alive"/>
     <variant name="death">
       <props>
         <prop attachpoint="garrisoned"/>

binaries/data/mods/public/simulation/components/GarrisonHolder.js

@@ -566 +566 @@
 
 GarrisonHolder.prototype.UpdateGarrisonFlag = function()
 {
-    var cmpVisual = Engine.QueryInterface(this.entity, IID_Visual);
+    let cmpVisual = Engine.QueryInterface(this.entity, IID_Visual);
     if (!cmpVisual)
         return;
-    cmpVisual.SelectAnimation("garrisoned", true, 0, "");
-    // TODO: ought to extend ICmpVisual to let us just select variant
-    // keywords without changing the animation too
+    let oldVariant = "garrisoned";
+    let newVariant = "garrisoned";
     if (this.entities.length)
-        cmpVisual.SelectAnimation("garrisoned", false, 1.0, "");
+        oldVariant = "ungarrisoned";
     else
-        cmpVisual.SelectAnimation("idle", false, 1.0, "");
+        newVariant = "ungarrisoned";
+
+    let selections = cmpVisual.GetVariantSelections();
+    cmpVisual.SetVariantSelections(selections.map(s => s == oldVariant ? newVariant : s))
 };
 
 /**

source/simulation2/components/CCmpVisualActor.cpp

@@ -1 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -32 +32 @@
 #include "ICmpValueModificationManager.h"
 #include "ICmpVisibility.h"
 
+#include "simulation2/serialization/SerializeTemplates.h"
+
 #include "graphics/Decal.h"
 #include "graphics/Frustum.h"
 #include "graphics/Model.h"
@@ -230 +232 @@
         serialize.NumberFixed_Unbounded("anim sync repeat time", m_AnimSyncRepeatTime);
 
         serialize.NumberU32_Unbounded("seed", m_Seed);
-        // TODO: variation/selection strings
         serialize.String("actor", m_ActorName, 0, 256);
 
         // TODO: store actor variables?
@@ -246 +247 @@
         }
 
         SerializeCommon(serialize);
+
+        std::vector<std::string> variantSelections = GetVariantSelections();
+        SerializeVector<SerializeString>()(serialize, "variantSeletions", variantSelections);
     }
 
     virtual void Deserialize(const CParamNode& paramNode, IDeserializer& deserialize)
@@ -269 +273 @@
 
         SetAnimationSyncRepeat(repeattime);
 
+        std::vector<std::string> variantSelections;
+        SerializeVector<SerializeString>()(deserialize, "variantSeletions", variantSelections);
+        SetVariantSelections(variantSelections);
+
         if (m_Unit)
         {
             CmpPtr<ICmpOwnership> cmpOwnership(GetEntityHandle());
@@ -410 +418 @@
         return CVector3D();
     }
 
+    virtual std::vector<std::string> GetVariantSelections()
+    {
+        std::vector<std::string> result;
+        if (!m_Unit)
+            return result;
+        std::set<CStr> selections = m_Unit->GetActorSelections();
+        std::copy(selections.begin(), selections.end(), std::back_inserter(result));
+        return result;
+    }
+
+    virtual void SetVariantSelections(const std::vector<std::string>& selections)
+    {
+        if (!m_Unit)
+            return;
+        std::set<CStr> result(selections.begin(), selections.end());
+        m_Unit->SetActorSelections(result);
+    }
+
     virtual void SelectAnimation(const std::string& name, bool once, fixed speed, const std::wstring& soundgroup)
     {
         m_AnimRunThreshold = fixed::Zero();

source/simulation2/components/ICmpVisual.cpp

@@ -1 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -22 +22 @@
 #include "simulation2/system/InterfaceScripted.h"
 
 BEGIN_INTERFACE_WRAPPER(Visual)
+DEFINE_INTERFACE_METHOD_0("GetVariantSelections", std::vector<std::string>, ICmpVisual, GetVariantSelections)
+DEFINE_INTERFACE_METHOD_1("SetVariantSelections", void, ICmpVisual, SetVariantSelections, std::vector<std::string>)
 DEFINE_INTERFACE_METHOD_4("SelectAnimation", void, ICmpVisual, SelectAnimation, std::string, bool, fixed, std::wstring)
 DEFINE_INTERFACE_METHOD_1("SelectMovementAnimation", void, ICmpVisual, SelectMovementAnimation, fixed)
 DEFINE_INTERFACE_METHOD_1("ResetMoveAnimation", void, ICmpVisual, ResetMoveAnimation, std::string)

source/simulation2/components/ICmpVisual.h

@@ -1 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2016 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -80 +80 @@
     virtual CUnit* GetUnit() = 0;
 
     /**
+     * Get the variant selections of the actor
+     */
+    virtual std::vector<std::string> GetVariantSelections() = 0;
+
+    /**
+     * Set the variant selections of the actor
+     */
+    virtual void SetVariantSelections(const std::vector<std::string>& selections) = 0;
+
+    /**
      * Start playing the given animation. If there are multiple possible animations then it will
      * pick one at random (not network-synchronised).
      * If @p soundgroup is specified, then the sound will be played at each 'event' point in the