haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed code stubs for WWWInline support in VRML1; the construct will not be supported

This commit is contained in:
Cirilo Bernardo 2016-02-25 13:30:21 +11:00
parent b2bdca4b7b
commit 611d5de179
3 changed files with 1 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/3d/vrml/v1/vrml1_base.cpp
View File

@ -40,7 +40,6 @@
WRL1BASE::WRL1BASE() : WRL1NODE( NULL ) WRL1BASE::WRL1BASE() : WRL1NODE( NULL )
{ {
m_useInline = false;
m_Type = WRL1_BASE; m_Type = WRL1_BASE;
m_dictionary = new NAMEREGISTER; m_dictionary = new NAMEREGISTER;
return; return;
@ -74,44 +73,6 @@ bool WRL1BASE::SetParent( WRL1NODE* aParent )
} }
void WRL1BASE::SetEnableInline( bool enable )
{
m_useInline = enable;
return;
}
bool WRL1BASE::GetEnableInline( void )
{
return m_useInline;
}
SGNODE* WRL1BASE::AddInlineData( const std::string& aName, WRL1INLINE* aObject )
{
std::map< std::string, WRL1INLINE* >::iterator dp = m_inlineModels.find( aName );
// XXX;
// qwerty;
return NULL;
}
SGNODE* WRL1BASE::GetInlineData( const std::string& aName, WRL1INLINE* aObject )
{
// XXX;
// qwerty;
return NULL;
}
void WRL1BASE::DelInlineData( const std::string& aName, WRL1INLINE* aObject )
{
// XXX;
// qwerty;
return;
}
std::string WRL1BASE::GetName( void ) std::string WRL1BASE::GetName( void )
{ {
#ifdef DEBUG_VRML1 #ifdef DEBUG_VRML1

13
plugins/3d/vrml/v1/vrml1_base.h
View File

@ -45,8 +45,6 @@ class WRL1INLINE;
class WRL1BASE : public WRL1NODE class WRL1BASE : public WRL1NODE
{ {
private: private:
bool m_useInline;
// handle cases of USE / DEF // handle cases of USE / DEF
bool implementUse( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode ); bool implementUse( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode );
bool implementDef( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode ); bool implementDef( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode );
@ -61,21 +59,10 @@ private:
bool readTransform( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode ); bool readTransform( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode );
bool readShapeHints( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode ); bool readShapeHints( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode );
std::map< std::string, WRL1INLINE* > m_inlineModels;
public: public:
WRL1BASE(); WRL1BASE();
virtual ~WRL1BASE(); virtual ~WRL1BASE();
// function to enable/disable Inline{} expansion
void SetEnableInline( bool enable );
bool GetEnableInline( void );
// functions to manipulate Inline{} objects
SGNODE* AddInlineData( const std::string& aName, WRL1INLINE* aObject );
SGNODE* GetInlineData( const std::string& aName, WRL1INLINE* aObject );
void DelInlineData( const std::string& aName, WRL1INLINE* aObject );
// function to read entire VRML file // function to read entire VRML file
bool Read( WRLPROC& proc ); bool Read( WRLPROC& proc );

5
plugins/3d/vrml/vrml.cpp
View File

@ -46,7 +46,7 @@
#define PLUGIN_VRML_MAJOR 1 #define PLUGIN_VRML_MAJOR 1
#define PLUGIN_VRML_MINOR 3 #define PLUGIN_VRML_MINOR 3
#define PLUGIN_VRML_PATCH 0 #define PLUGIN_VRML_PATCH 0
#define PLUGIN_VRML_REVNO 0 #define PLUGIN_VRML_REVNO 1
const char* GetKicadPluginName( void ) const char* GetKicadPluginName( void )
@ -198,9 +198,6 @@ SCENEGRAPH* LoadVRML( const wxString& aFileName, bool useInline )
WRL1BASE* bp = new WRL1BASE; WRL1BASE* bp = new WRL1BASE;
// allow or ignore Inline{} files
bp->SetEnableInline( useInline );
if( !bp->Read( proc ) ) if( !bp->Read( proc ) )
{ {
wxLogTrace( MASK_VRML, " * [INFO] load failed\n" ); wxLogTrace( MASK_VRML, " * [INFO] load failed\n" );