Ticket #5709: 0ad-fcollada.patch

File 0ad-fcollada.patch, 2.3 KB (added by pcpa, 4 years ago)

0ad-fcollada.patch

  • 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h

    diff -up 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h.orig 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
    old new public:  
    553553
    554554    static void WritePhysicsRigidBodyParameters(FCDPhysicsRigidBodyParameters* physicsRigidBodyParameters, xmlNode* techniqueNode);
    555555    template <class TYPE, int QUAL>
    556     static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value);
     556    static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value) {
     557        xmlNode* paramNode = AddChild(parentNode, name);
     558        AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
     559        if (value.IsAnimated())
     560        {
     561            const FCDAnimated* animated = value.GetAnimated();
     562            FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
     563        }
     564        return paramNode;
     565    }
    557566
    558567
    559568    //
  • 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp

    diff -up 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp.orig 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
    old new void FArchiveXML::WritePhysicsRigidBodyP  
    329329        FArchiveXML::LetWriteObject(physicsRigidBodyParameters->GetPhysicsShape(i), techniqueNode);
    330330    }
    331331}
    332 
    333 template <class TYPE, int QUAL>
    334 xmlNode* FArchiveXML::AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value)
    335 {
    336     xmlNode* paramNode = AddChild(parentNode, name);
    337     AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
    338     if (value.IsAnimated())
    339     {
    340         const FCDAnimated* animated = value.GetAnimated();
    341         FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
    342     }
    343     return paramNode;
    344 }