X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fbvh%2FBVHStaticGeometryBuilder.hxx;h=b390d931d4c7863538db21bad002c5a13985cdf3;hb=8ddcef914296ff7ef2a099097ffd704742492484;hp=98968162e7bebbf872fbfae878c71efb69e1b969;hpb=22878b6f897abb5895cd7054f4ea666666fa6778;p=simgear.git diff --git a/simgear/bvh/BVHStaticGeometryBuilder.hxx b/simgear/bvh/BVHStaticGeometryBuilder.hxx index 98968162..b390d931 100644 --- a/simgear/bvh/BVHStaticGeometryBuilder.hxx +++ b/simgear/bvh/BVHStaticGeometryBuilder.hxx @@ -78,16 +78,16 @@ public: typedef std::set > TriangleSet; TriangleSet _triangleSet; - void setCurrentMaterial(const SGMaterial* material) + void setCurrentMaterial(const BVHMaterial* material) { _currentMaterial = material; _currentMaterialIndex = addMaterial(material); } - const SGMaterial* getCurrentMaterial() const + const BVHMaterial* getCurrentMaterial() const { return _currentMaterial; } - unsigned addMaterial(const SGMaterial* material) + unsigned addMaterial(const BVHMaterial* material) { MaterialMap::const_iterator i = _materialMap.find(material); if (i != _materialMap.end()) @@ -97,9 +97,9 @@ public: return index; } - typedef std::map MaterialMap; + typedef std::map MaterialMap; MaterialMap _materialMap; - const SGMaterial* _currentMaterial; + const BVHMaterial* _currentMaterial; unsigned _currentMaterialIndex; void addTriangle(const SGVec3f& v1, const SGVec3f& v2, const SGVec3f& v3)