From 2631ae5351eebcb3f6bf6e58d8dadf56a3f22068 Mon Sep 17 00:00:00 2001 From: cnr-isti-vclab Date: Wed, 25 Mar 2009 07:51:28 +0000 Subject: [PATCH] Added sph49f, disabled ImportLocal for a while --- vcg/simplex/vertex/component_sph.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vcg/simplex/vertex/component_sph.h b/vcg/simplex/vertex/component_sph.h index a9c80b0e..632772d9 100644 --- a/vcg/simplex/vertex/component_sph.h +++ b/vcg/simplex/vertex/component_sph.h @@ -13,7 +13,8 @@ public: SphType &SH() { return _harmonics; } const SphType &cSH() const { return _harmonics; } template < class LeftV> - void ImportLocal(const LeftV & left ) { SH() = left.cSH(); T::ImportLocal( left); } + // void ImportLocal(const LeftV & left ) { SH() = left.cSH(); T::ImportLocal( left); } + void ImportLocal(const LeftV & left ) { T::ImportLocal( left); } static bool HasSH() { return true; } static void Name(std::vector & name){name.push_back(std::string("Spherical Harmonics"));T::Name(name);} @@ -37,6 +38,10 @@ template class Sph36f: public Sph & name){name.push_back(std::string("Sph36f"));T::Name(name);} }; +template class Sph49f: public Sph, T> { + public: static void Name(std::vector & name){name.push_back(std::string("Sph49f"));T::Name(name);} +}; + template class Sph9d: public Sph, T> { public: static void Name(std::vector & name){name.push_back(std::string("Sph9d"));T::Name(name);} };