From 8fb900da85ffe38959dd24b6d559284d0a6d414f Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Wed, 27 Sep 2023 13:36:29 +0300
Subject: [PATCH] Remove GeometryInterface

Actually, it was a terrible idea
---
 components/nif/node.hpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index f560932e22..d17de999ee 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -119,14 +119,7 @@ namespace Nif
         void post(Reader& nif) override;
     };
 
-    struct GeometryInterface
-    {
-        NiSkinInstancePtr mSkin;
-        BSShaderPropertyPtr mShaderProperty;
-        NiAlphaPropertyPtr mAlphaProperty;
-    };
-
-    struct NiGeometry : NiAVObject, GeometryInterface
+    struct NiGeometry : NiAVObject
     {
         /* Possible flags:
             0x40 - mesh has no vertex normals ?
@@ -145,8 +138,12 @@ namespace Nif
             void read(NIFStream* nif);
         };
 
+
         NiGeometryDataPtr mData;
+        NiSkinInstancePtr mSkin;
         MaterialData mMaterial;
+        BSShaderPropertyPtr mShaderProperty;
+        NiAlphaPropertyPtr mAlphaProperty;
 
         void read(NIFStream* nif) override;
         void post(Reader& nif) override;
@@ -365,10 +362,13 @@ namespace Nif
         void read(NIFStream* nif, uint16_t flags);
     };
 
-    struct BSTriShape : NiAVObject, GeometryInterface
+    struct BSTriShape : NiAVObject
     {
         osg::BoundingSpheref mBoundingSphere;
         std::array<float, 6> mBoundMinMax;
+        RecordPtrT<Record> mSkin;
+        BSShaderPropertyPtr mShaderProperty;
+        NiAlphaPropertyPtr mAlphaProperty;
         BSVertexDesc mVertDesc;
         uint32_t mDataSize;
         std::vector<BSVertexData> mVertData;