Merge remote-tracking branch 'zini/master' into skeleton-fixes

components/nif/nif_file.cpp

@@ -256,6 +256,7 @@ void NIFFile::parse()
       else if(rec == "NiDitherProperty") { r = new NiDitherProperty; r->recType = RC_NiDitherProperty; }
       else if(rec == "NiWireframeProperty") { r = new NiWireframeProperty; r->recType = RC_NiWireframeProperty; }
       else if(rec == "NiSpecularProperty") { r = new NiSpecularProperty; r->recType = RC_NiSpecularProperty; }
+      else if(rec == "NiStencilProperty") { r = new NiStencilProperty; r->recType = RC_NiStencilProperty; }
 
       // Controllers
       else if(rec == "NiVisController") { r = new NiVisController; r->recType = RC_NiVisController; }

components/nif/nif_file.hpp

@@ -158,6 +158,7 @@ public:
     short getShort() { return read_le16(); }
     unsigned short getUShort() { return read_le16(); }
     int getInt() { return read_le32(); }
+    unsigned int getUInt() { return read_le32(); }
     float getFloat() { return read_le32f(); }
     Ogre::Vector2 getVector2()
     {

components/nif/property.hpp

@@ -257,9 +257,66 @@ struct S_AlphaProperty
     }
 };
 
+/*
+    Docs taken from:
+    http://niftools.sourceforge.net/doc/nif/NiStencilProperty.html
+ */
+struct S_StencilProperty
+{
+    // Is stencil test enabled?
+    unsigned char enabled;
+
+    /*
+        0   TEST_NEVER
+        1   TEST_LESS
+        2   TEST_EQUAL
+        3   TEST_LESS_EQUAL
+        4   TEST_GREATER
+        5   TEST_NOT_EQUAL
+        6   TEST_GREATER_EQUAL
+        7   TEST_ALWAYS
+     */
+    int compareFunc;
+    unsigned stencilRef;
+    unsigned stencilMask;
+    /*
+        Stencil test fail action, depth test fail action and depth test pass action:
+        0   ACTION_KEEP
+        1   ACTION_ZERO
+        2   ACTION_REPLACE
+        3   ACTION_INCREMENT
+        4   ACTION_DECREMENT
+        5   ACTION_INVERT
+     */
+    int failAction;
+    int zFailAction;
+    int zPassAction;
+    /*
+        Face draw mode:
+        0   DRAW_CCW_OR_BOTH
+        1   DRAW_CCW        [default]
+        2   DRAW_CW
+        3   DRAW_BOTH
+     */
+    int drawMode;
+
+    void read(NIFFile *nif)
+    {
+        enabled = nif->getChar();
+        compareFunc = nif->getInt();
+        stencilRef = nif->getUInt();
+        stencilMask = nif->getUInt();
+        failAction = nif->getInt();
+        zFailAction = nif->getInt();
+        zPassAction = nif->getInt();
+        drawMode = nif->getInt();
+    }
+};
+
 typedef StructPropT<S_AlphaProperty> NiAlphaProperty;
 typedef StructPropT<S_MaterialProperty> NiMaterialProperty;
 typedef StructPropT<S_VertexColorProperty> NiVertexColorProperty;
+typedef StructPropT<S_StencilProperty> NiStencilProperty;
 
 } // Namespace
 #endif

components/nif/record.hpp

@@ -48,6 +48,7 @@ enum RecordType
   RC_NiDitherProperty,
   RC_NiWireframeProperty,
   RC_NiSpecularProperty,
+  RC_NiStencilProperty,
   RC_NiVisController,
   RC_NiGeomMorpherController,
   RC_NiKeyframeController,

components/nifogre/ogre_nif_loader.cpp

@@ -587,6 +587,8 @@ static Ogre::String getMaterial(const Nif::NiTriShape *shape, const Ogre::String
             m = static_cast<const Nif::NiMaterialProperty*>(pr);
         else if (pr->recType == Nif::RC_NiAlphaProperty)
             a = static_cast<const Nif::NiAlphaProperty*>(pr);
+        else if (pr->recType == Nif::RC_NiStencilProperty)
+            /* unused */;
         else
             warn("Skipped property type: "+pr->recName);
     }