From b426740195ab735d8bd9d251fc7f925057e3c11f Mon Sep 17 00:00:00 2001 From: Cirilo Bernardo Date: Fri, 1 Jan 2016 16:23:21 +1100 Subject: [PATCH] Removed dead code modules --- 3d-viewer/3d_cache/sg/ifsg_normalindex.cpp | 158 --------------------- include/plugins/3dapi/ifsg_normalindex.h | 52 ------- 2 files changed, 210 deletions(-) delete mode 100644 3d-viewer/3d_cache/sg/ifsg_normalindex.cpp delete mode 100644 include/plugins/3dapi/ifsg_normalindex.h diff --git a/3d-viewer/3d_cache/sg/ifsg_normalindex.cpp b/3d-viewer/3d_cache/sg/ifsg_normalindex.cpp deleted file mode 100644 index 884aefe9fd..0000000000 --- a/3d-viewer/3d_cache/sg/ifsg_normalindex.cpp +++ /dev/null @@ -1,158 +0,0 @@ -/* - * This program source code file is part of KiCad, a free EDA CAD application. - * - * Copyright (C) 2015 Cirilo Bernardo - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - - -#include -#include "plugins/3dapi/ifsg_normalindex.h" -#include "3d_cache/sg/sg_normalindex.h" -#include "plugins/3dapi/sg_types.h" - - -extern char BadObject[]; -extern char BadOperand[]; -extern char BadParent[]; -extern char WrongParent[]; - - -IFSG_NORMALINDEX::IFSG_NORMALINDEX( bool create ) -{ - m_node = NULL; - - if( !create ) - return; - - m_node = new SGNORMALINDEX( NULL ); - - if( m_node ) - m_node->AssociateWrapper( &m_node ); - - return; -} - - -IFSG_NORMALINDEX::IFSG_NORMALINDEX( SGNODE* aParent ) -{ - m_node = new SGNORMALINDEX( NULL ); - - if( !m_node->SetParent( aParent ) ) - { - delete m_node; - m_node = NULL; - std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - std::cerr << WrongParent << "\n"; - return; - } - - m_node->AssociateWrapper( &m_node ); - - return; -} - - -IFSG_NORMALINDEX::IFSG_NORMALINDEX( IFSG_NODE& aParent ) -{ - SGNODE* pp = aParent.GetRawPtr(); - - if( !pp ) - { - std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - std::cerr << BadParent << "\n"; - return; - } - - m_node = new SGNORMALINDEX( NULL ); - - if( !m_node->SetParent( pp ) ) - { - delete m_node; - m_node = NULL; - std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - std::cerr << WrongParent << "\n"; - return; - } - - m_node->AssociateWrapper( &m_node ); - - return; -} - - -bool IFSG_NORMALINDEX::Attach( SGNODE* aNode ) -{ - if( m_node ) - m_node->DisassociateWrapper( &m_node ); - - m_node = NULL; - - if( !aNode ) - return false; - - if( S3D::SGTYPE_NORMALINDEX != aNode->GetNodeType() ) - { - return false; - } - - m_node = aNode; - m_node->AssociateWrapper( &m_node ); - - return true; -} - - -bool IFSG_NORMALINDEX::NewNode( SGNODE* aParent ) -{ - if( m_node ) - m_node->DisassociateWrapper( &m_node ); - - m_node = new SGNORMALINDEX( aParent ); - - if( aParent != m_node->GetParent() ) - { - std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - std::cerr << " * [BUG] invalid SGNODE parent ("; - std::cerr << aParent->GetNodeTypeName( aParent->GetNodeType() ); - std::cerr << ") to SGNORMALINDEX\n"; - delete m_node; - m_node = NULL; - return false; - } - - m_node->AssociateWrapper( &m_node ); - - return true; -} - - -bool IFSG_NORMALINDEX::NewNode( IFSG_NODE& aParent ) -{ - SGNODE* np = aParent.GetRawPtr(); - - if( NULL == np ) - { - std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n"; - std::cerr << BadParent << "\n"; - return false; - } - - return NewNode( np ); -} diff --git a/include/plugins/3dapi/ifsg_normalindex.h b/include/plugins/3dapi/ifsg_normalindex.h deleted file mode 100644 index 57d8f8972b..0000000000 --- a/include/plugins/3dapi/ifsg_normalindex.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * This program source code file is part of KiCad, a free EDA CAD application. - * - * Copyright (C) 2015 Cirilo Bernardo - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, you may find one here: - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html - * or you may search the http://www.gnu.org website for the version 2 license, - * or you may write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/** - * @file ifsg_coordindex.h - * defines the CoordIndex node wrapper - */ - - -#ifndef IFSG_NORMALINDEX_H -#define IFSG_NORMALINDEX_H - -#include "plugins/3dapi/ifsg_index.h" - - -/** - * Class IFSG_NORMALINDEX - * is the wrapper for SGNORMALINDEX - */ -class SGLIB_API IFSG_NORMALINDEX : public IFSG_INDEX -{ -public: - IFSG_NORMALINDEX( bool create ); - IFSG_NORMALINDEX( SGNODE* aParent ); - IFSG_NORMALINDEX( IFSG_NODE& aParent ); - - bool Attach( SGNODE* aNode ); - bool NewNode( SGNODE* aParent ); - bool NewNode( IFSG_NODE& aParent ); -}; - -#endif // IFSG_NORMALINDEX_H