diff --git a/3d-viewer/3d_cache/3d_cache.cpp b/3d-viewer/3d_cache/3d_cache.cpp index 7190253b1c..b9d7f0de0b 100644 --- a/3d-viewer/3d_cache/3d_cache.cpp +++ b/3d-viewer/3d_cache/3d_cache.cpp @@ -626,7 +626,7 @@ void S3D_CACHE::ClosePlugins( void ) } -S3DMODEL* S3D_CACHE::Prepare( const wxString& aModelFileName ) +S3DMODEL* S3D_CACHE::GetModel( const wxString& aModelFileName ) { S3D_CACHE_ENTRY* cp = NULL; SCENEGRAPH* sp = load( aModelFileName, &cp ); @@ -644,7 +644,7 @@ S3DMODEL* S3D_CACHE::Prepare( const wxString& aModelFileName ) if( cp->renderData ) return cp->renderData; - S3DMODEL* mp = S3D::Prepare( sp ); + S3DMODEL* mp = S3D::GetModel( sp ); cp->renderData = mp; return mp; diff --git a/3d-viewer/3d_cache/3d_cache.h b/3d-viewer/3d_cache/3d_cache.h index c7fdfe9666..51a176f370 100644 --- a/3d-viewer/3d_cache/3d_cache.h +++ b/3d-viewer/3d_cache/3d_cache.h @@ -183,14 +183,14 @@ public: void ClosePlugins( void ); /** - * Function Prepare + * Function GetModel * attempts to load the scene data for a model and to translate it * into an S3D_MODEL structure for display by a renderer * * @param aModelFileName is the full path to the model to be loaded * @return is a pointer to the render data or NULL if not available */ - S3DMODEL* Prepare( const wxString& aModelFileName ); + S3DMODEL* GetModel( const wxString& aModelFileName ); }; #endif // CACHE_3D_H diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp b/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp index d5325380ba..1fa0a08451 100644 --- a/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp +++ b/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp @@ -581,7 +581,7 @@ void PANEL_PREV_3D::UpdateModelName( wxString const& aModelName ) return; } - model = m_ModelManager->Prepare( modelInfo.filename ); + model = m_ModelManager->GetModel( modelInfo.filename ); if( NULL == model ) { @@ -679,7 +679,7 @@ void PANEL_PREV_3D::updateOrientation( wxCommandEvent &event ) canvas->Clear3DModel(); - model = m_ModelManager->Prepare( modelInfo.filename ); + model = m_ModelManager->GetModel( modelInfo.filename ); if( model ) { diff --git a/3d-viewer/3d_cache/sg/ifsg_api.cpp b/3d-viewer/3d_cache/sg/ifsg_api.cpp index be5d6466db..fc902ec9d4 100644 --- a/3d-viewer/3d_cache/sg/ifsg_api.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_api.cpp @@ -304,7 +304,7 @@ SGNODE* S3D::ReadCache( const wxString& aFileName ) } -S3DMODEL* S3D::Prepare( SCENEGRAPH* aNode ) +S3DMODEL* S3D::GetModel( SCENEGRAPH* aNode ) { if( NULL == aNode ) return NULL; diff --git a/include/plugins/3dapi/ifsg_api.h b/include/plugins/3dapi/ifsg_api.h index acdd396e4b..8dea5f4eb5 100644 --- a/include/plugins/3dapi/ifsg_api.h +++ b/include/plugins/3dapi/ifsg_api.h @@ -130,13 +130,13 @@ namespace S3D // of data structures for rendering /** - * Function Prepare + * Function GetModel * creates an S3DMODEL representation of aNode (raw data, no transforms) * * @param aNode is the node to be transcribed into an S3DMODEL representation * @return an S3DMODEL representation of aNode on success, otherwise NULL */ - SGLIB_API S3DMODEL* Prepare( SCENEGRAPH* aNode ); + SGLIB_API S3DMODEL* GetModel( SCENEGRAPH* aNode ); /** * Function Destroy3DModel