diff --git a/plugins/3d/vrml/v1/vrml1_base.cpp b/plugins/3d/vrml/v1/vrml1_base.cpp index 4f2a729f15..59f5bc5e32 100644 --- a/plugins/3d/vrml/v1/vrml1_base.cpp +++ b/plugins/3d/vrml/v1/vrml1_base.cpp @@ -40,7 +40,6 @@ WRL1BASE::WRL1BASE() : WRL1NODE( NULL ) { - m_useInline = false; m_Type = WRL1_BASE; m_dictionary = new NAMEREGISTER; 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 ) { #ifdef DEBUG_VRML1 diff --git a/plugins/3d/vrml/v1/vrml1_base.h b/plugins/3d/vrml/v1/vrml1_base.h index 19e01fac9e..5ea5849758 100644 --- a/plugins/3d/vrml/v1/vrml1_base.h +++ b/plugins/3d/vrml/v1/vrml1_base.h @@ -45,8 +45,6 @@ class WRL1INLINE; class WRL1BASE : public WRL1NODE { private: - bool m_useInline; - // handle cases of USE / DEF bool implementUse( 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 readShapeHints( WRLPROC& proc, WRL1NODE* aParent, WRL1NODE** aNode ); - std::map< std::string, WRL1INLINE* > m_inlineModels; - public: 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 bool Read( WRLPROC& proc ); diff --git a/plugins/3d/vrml/vrml.cpp b/plugins/3d/vrml/vrml.cpp index 9769095cfd..eec0cfa756 100644 --- a/plugins/3d/vrml/vrml.cpp +++ b/plugins/3d/vrml/vrml.cpp @@ -46,7 +46,7 @@ #define PLUGIN_VRML_MAJOR 1 #define PLUGIN_VRML_MINOR 3 #define PLUGIN_VRML_PATCH 0 -#define PLUGIN_VRML_REVNO 0 +#define PLUGIN_VRML_REVNO 1 const char* GetKicadPluginName( void ) @@ -198,9 +198,6 @@ SCENEGRAPH* LoadVRML( const wxString& aFileName, bool useInline ) WRL1BASE* bp = new WRL1BASE; - // allow or ignore Inline{} files - bp->SetEnableInline( useInline ); - if( !bp->Read( proc ) ) { wxLogTrace( MASK_VRML, " * [INFO] load failed\n" );