Removing redundant sg/ifsg colorindex files and references
This commit is contained in:
Cirilo Bernardo
parent
7e165ac866
commit
9d55ad375f
|
|
@ -32,7 +32,6 @@
|
||||||
#include "3d_cache/sg/sg_node.h"
|
#include "3d_cache/sg/sg_node.h"
|
||||||
#include "3d_cache/sg/scenegraph.h"
|
#include "3d_cache/sg/scenegraph.h"
|
||||||
#include "3d_cache/sg/sg_appearance.h"
|
#include "3d_cache/sg/sg_appearance.h"
|
||||||
#include "3d_cache/sg/sg_colorindex.h"
|
|
||||||
#include "3d_cache/sg/sg_colors.h"
|
#include "3d_cache/sg/sg_colors.h"
|
||||||
#include "3d_cache/sg/sg_coordindex.h"
|
#include "3d_cache/sg/sg_coordindex.h"
|
||||||
#include "3d_cache/sg/sg_coords.h"
|
#include "3d_cache/sg/sg_coords.h"
|
||||||
|
|
|
||||||
|
|
@ -1,158 +0,0 @@
|
||||||
/*
|
|
||||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Cirilo Bernardo <cirilo.bernardo@gmail.com>
|
|
||||||
*
|
|
||||||
* 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 <iostream>
|
|
||||||
#include "plugins/3dapi/ifsg_colorindex.h"
|
|
||||||
#include "3d_cache/sg/sg_colorindex.h"
|
|
||||||
#include "plugins/3dapi/sg_types.h"
|
|
||||||
|
|
||||||
|
|
||||||
extern char BadObject[];
|
|
||||||
extern char BadOperand[];
|
|
||||||
extern char BadParent[];
|
|
||||||
extern char WrongParent[];
|
|
||||||
|
|
||||||
|
|
||||||
IFSG_COLORINDEX::IFSG_COLORINDEX( bool create )
|
|
||||||
{
|
|
||||||
m_node = NULL;
|
|
||||||
|
|
||||||
if( !create )
|
|
||||||
return;
|
|
||||||
|
|
||||||
m_node = new SGCOLORINDEX( NULL );
|
|
||||||
|
|
||||||
if( m_node )
|
|
||||||
m_node->AssociateWrapper( &m_node );
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
IFSG_COLORINDEX::IFSG_COLORINDEX( SGNODE* aParent )
|
|
||||||
{
|
|
||||||
m_node = new SGCOLORINDEX( 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_COLORINDEX::IFSG_COLORINDEX( IFSG_NODE& aParent )
|
|
||||||
{
|
|
||||||
SGNODE* pp = aParent.GetRawPtr();
|
|
||||||
|
|
||||||
if( !pp )
|
|
||||||
{
|
|
||||||
std::cerr << __FILE__ << ": " << __FUNCTION__ << ": " << __LINE__ << "\n";
|
|
||||||
std::cerr << BadParent << "\n";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
m_node = new SGCOLORINDEX( 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_COLORINDEX::Attach( SGNODE* aNode )
|
|
||||||
{
|
|
||||||
if( m_node )
|
|
||||||
m_node->DisassociateWrapper( &m_node );
|
|
||||||
|
|
||||||
m_node = NULL;
|
|
||||||
|
|
||||||
if( !aNode )
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if( S3D::SGTYPE_COLORINDEX != aNode->GetNodeType() )
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
m_node = aNode;
|
|
||||||
m_node->AssociateWrapper( &m_node );
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool IFSG_COLORINDEX::NewNode( SGNODE* aParent )
|
|
||||||
{
|
|
||||||
if( m_node )
|
|
||||||
m_node->DisassociateWrapper( &m_node );
|
|
||||||
|
|
||||||
m_node = new SGCOLORINDEX( 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 SGCOLORINDEX\n";
|
|
||||||
delete m_node;
|
|
||||||
m_node = NULL;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
m_node->AssociateWrapper( &m_node );
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool IFSG_COLORINDEX::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 );
|
|
||||||
}
|
|
||||||
|
|
@ -25,7 +25,6 @@
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include "plugins/3dapi/ifsg_index.h"
|
#include "plugins/3dapi/ifsg_index.h"
|
||||||
#include "3d_cache/sg/sg_coordindex.h"
|
#include "3d_cache/sg/sg_coordindex.h"
|
||||||
#include "3d_cache/sg/sg_colorindex.h"
|
|
||||||
|
|
||||||
|
|
||||||
extern char BadObject[];
|
extern char BadObject[];
|
||||||
|
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
/*
|
|
||||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Cirilo Bernardo <cirilo.bernardo@gmail.com>
|
|
||||||
*
|
|
||||||
* 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 "3d_cache/sg/sg_colorindex.h"
|
|
||||||
|
|
||||||
SGCOLORINDEX::SGCOLORINDEX( SGNODE* aParent ) : SGINDEX( aParent )
|
|
||||||
{
|
|
||||||
m_SGtype = S3D::SGTYPE_COLORINDEX;
|
|
||||||
|
|
||||||
if( NULL != aParent && S3D::SGTYPE_FACESET == aParent->GetNodeType() )
|
|
||||||
{
|
|
||||||
m_Parent->AddChildNode( this );
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
SGCOLORINDEX::~SGCOLORINDEX()
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
@ -1,41 +0,0 @@
|
||||||
/*
|
|
||||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Cirilo Bernardo <cirilo.bernardo@gmail.com>
|
|
||||||
*
|
|
||||||
* 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 sg_colorindex.h
|
|
||||||
* defines an RGB color index mapping for a scenegraph object
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SG_COLORINDEX_H
|
|
||||||
#define SG_COLORINDEX_H
|
|
||||||
|
|
||||||
#include "3d_cache/sg/sg_index.h"
|
|
||||||
|
|
||||||
class SGCOLORINDEX : public SGINDEX
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
SGCOLORINDEX( SGNODE* aParent );
|
|
||||||
virtual ~SGCOLORINDEX();
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // SG_COLORINDEX_H
|
|
||||||
|
|
@ -27,7 +27,6 @@
|
||||||
#include "3d_cache/sg/sg_colors.h"
|
#include "3d_cache/sg/sg_colors.h"
|
||||||
#include "3d_cache/sg/sg_coords.h"
|
#include "3d_cache/sg/sg_coords.h"
|
||||||
#include "3d_cache/sg/sg_normals.h"
|
#include "3d_cache/sg/sg_normals.h"
|
||||||
#include "3d_cache/sg/sg_colorindex.h"
|
|
||||||
#include "3d_cache/sg/sg_coordindex.h"
|
#include "3d_cache/sg/sg_coordindex.h"
|
||||||
#include "3d_cache/sg/sg_helpers.h"
|
#include "3d_cache/sg/sg_helpers.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@
|
||||||
#include "3d_cache/sg/sg_appearance.h"
|
#include "3d_cache/sg/sg_appearance.h"
|
||||||
#include "3d_cache/sg/sg_helpers.h"
|
#include "3d_cache/sg/sg_helpers.h"
|
||||||
#include "3d_cache/sg/sg_coordindex.h"
|
#include "3d_cache/sg/sg_coordindex.h"
|
||||||
#include "3d_cache/sg/sg_colorindex.h"
|
|
||||||
#include "3d_cache/sg/sg_coords.h"
|
#include "3d_cache/sg/sg_coords.h"
|
||||||
#include "3d_cache/sg/sg_colors.h"
|
#include "3d_cache/sg/sg_colors.h"
|
||||||
#include "3d_cache/sg/sg_normals.h"
|
#include "3d_cache/sg/sg_normals.h"
|
||||||
|
|
|
||||||
|
|
@ -1,52 +0,0 @@
|
||||||
/*
|
|
||||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2015 Cirilo Bernardo <cirilo.bernardo@gmail.com>
|
|
||||||
*
|
|
||||||
* 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_colorindex.h
|
|
||||||
* defines the ColorIndex node wrapper
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef IFSG_COLORINDEX_H
|
|
||||||
#define IFSG_COLORINDEX_H
|
|
||||||
|
|
||||||
#include "plugins/3dapi/ifsg_index.h"
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Class IFSG_COLORINDEX
|
|
||||||
* is the wrapper for SGCOLORINDEX
|
|
||||||
*/
|
|
||||||
class SGLIB_API IFSG_COLORINDEX : public IFSG_INDEX
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
IFSG_COLORINDEX( bool create );
|
|
||||||
IFSG_COLORINDEX( SGNODE* aParent );
|
|
||||||
IFSG_COLORINDEX( IFSG_NODE& aParent );
|
|
||||||
|
|
||||||
bool Attach( SGNODE* aNode );
|
|
||||||
bool NewNode( SGNODE* aParent );
|
|
||||||
bool NewNode( IFSG_NODE& aParent );
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // IFSG_COLORINDEX_H
|
|
||||||
Loading…
Reference in New Issue