AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-14 16:19:36 +00:00
Files Issues Releases Activity

Explicitly mark overriding functions.

Browse Source
This commit is contained in:
Simon Richter 2016-09-24 14:53:15 -04:00 committed by Wayne Stambaugh
parent 360794b3a4
commit 59c81976dc
352 changed files with 2491 additions and 2491 deletions
3d-viewer
3d_cache
dialogs
dlg_3d_pathconfig.hdlg_select_3dmodel.h
sg
scenegraph.hsg_appearance.hsg_colors.hsg_coords.hsg_faceset.hsg_index.hsg_normals.hsg_shape.h
3d_canvas
status_text_reporter.h
3d_rendering
3d_render_ogl_legacy
c3d_render_ogl_legacy.h
3d_render_raytracing
accelerators
cbvh_pbrt.hccontainer.hccontainer2d.h
c3d_render_raytracing.hclight.hcmaterial.h
shapes2D
cfilledcircle2d.hcitemlayercsg2d.hcpolygon2d.hcpolygon4pts2d.hcring2d.hcroundsegment2d.hctriangle2d.h
shapes3D
ccylinder.hcdummyblock.hclayeritem.hcplane.hcroundseg.hctriangle.h
cpostshader_ssao.hctrack_ball.h
3d_viewer
dialogs
dialog_3D_view_option.cpp
eda_3d_viewer.h
bitmap2component
bitmap2cmp_gui.cpp
common
confirm.cpp
dialogs
dialog_image_editor.hdialog_page_settings.hwx_html_report_panel.h
cvpcb
class_DisplayFootprintsFrame.hcvpcb.cppcvpcb_mainframe.h
dialogs
dialog_config_equfiles.hdialog_display_options.hfp_conflict_assignment_selector.h
listview_classes.h
eeschema
class_sch_screen.h
dialogs
dialog_annotate.cppdialog_bom.cppdialog_choose_component.hdialog_edit_component_in_lib.hdialog_edit_component_in_schematic.cppdialog_edit_label.cppdialog_edit_libentry_fields_in_lib.cppdialog_edit_one_field.hdialog_eeschema_config.cppdialog_eeschema_options.hdialog_erc.hdialog_lib_edit_pin.hdialog_lib_edit_pin_table.cppdialog_lib_edit_pin_table.hdialog_lib_edit_text.hdialog_netlist.cppdialog_plot_schematic.hdialog_print_using_printer.cppdialog_rescue_each.cppdialog_schematic_find.h
eeschema.cpplib_arc.hlib_bezier.hlib_circle.hlib_draw_item.hlib_field.hlib_pin.hlib_polyline.hlib_rectangle.hlib_text.hlibeditframe.h
netlist_exporters
netlist_exporter_cadstar.hnetlist_exporter_generic.hnetlist_exporter_orcadpcb2.hnetlist_exporter_pspice.h
sch_base_frame.hsch_bitmap.hsch_bus_entry.hsch_component.hsch_field.hsch_junction.hsch_line.hsch_marker.hsch_no_connect.hsch_sheet.hsch_text.hsch_validators.hschframe.hviewlib_frame.h
gerbview
class_gbr_layer_box_selector.hclass_gbr_screen.hclass_gerber_draw_item.hclass_gerbview_layer_widget.h
dialogs
dialog_print_using_printer.cppdialog_show_page_borders.hgerbview_dialog_display_options_frame.cpp
gerbview.cppgerbview_frame.hselect_layers_to_pcb.h
include
base_struct.hbasic_gal.hclass_base_screen.hclass_board_item.hclass_draw_panel_gal.hclass_drawpanel.hclass_pcb_screen.hclass_worksheet_dataitem.hconfig_params.hdialog_env_var_config.hdialog_get_component.hdialog_helpers.hdialog_hotkeys_editor.hdialog_shim.hdraw_frame.heda_pattern_match.hfilter_reader.h
gal
cairo
cairo_compositor.hcairo_gal.h
opengl
cached_container.hgpu_manager.hnoncached_container.hopengl_compositor.hopengl_gal.h
geometry
shape_line_chain.hshape_poly_set.hshape_rect.h
html_messagebox.hkiface_i.hkiway.hkiway_express.hkiway_player.horigin_viewitem.hplot_common.h
plugins/3dapi
ifsg_appearance.hifsg_colors.hifsg_coordindex.hifsg_coords.hifsg_faceset.hifsg_index.hifsg_normals.hifsg_shape.hifsg_transform.h
reporter.hrichio.h
tool
context_menu.h
ttl/halfedge
hetriang.h
view
view_group.hwx_view_controls.h
widgets
mathplot.h
worksheet_shape_builder.hworksheet_viewitem.hwxBasePcbFrame.hwxPcbStruct.hwxstruct.h
kicad
class_treeprojectfiles.h
dialogs
dialog_template_selector.h
kicad.hpgm_kicad.h
lib_dxf
drw_entities.h
intern
drw_textcodec.hdxfreader.hdxfwriter.h
pagelayout_editor
class_pl_editor_screen.hdesign_tree_frame.h
dialogs
dialog_new_dataitem.cppdialogs_for_printing.cpp
pl_editor.cpppl_editor_frame.hproperties_frame.h
pcb_calculator
UnitSelector.h
attenuators
attenuator_classes.h
pcb_calculator.cpppcb_calculator.hregulators_funct.cpp
transline
c_microstrip.hcoax.hcoplanar.hmicrostrip.hrectwaveguide.hstripline.htwistedpair.h
pcbnew
block.cppboard_commit.hclass_board.hclass_board_connected_item.hclass_dimension.hclass_drawsegment.hclass_edge_mod.hclass_marker_pcb.hclass_mire.hclass_module.hclass_netinfo.hclass_pad.hclass_pcb_layer_box_selector.hclass_pcb_layer_widget.hclass_pcb_text.hclass_text_mod.hclass_track.hclass_zone.hcollectors.h
dialogs
dialog_SVG_print.cppdialog_copper_zones.cppdialog_create_array.hdialog_design_rules.hdialog_design_rules_aux_helper_class.hdialog_display_options.hdialog_drc.hdialog_edit_module_for_BoardEditor.hdialog_edit_module_for_Modedit.hdialog_edit_module_text.hdialog_find.hdialog_footprint_wizard_list.hdialog_fp_lib_table.cppdialog_freeroute_exchange.hdialog_gendrill.hdialog_general_options.hdialog_global_deletion.hdialog_global_edit_tracks_and_vias.hdialog_global_modules_fields_edition.cppdialog_graphic_item_properties.cppdialog_graphic_item_properties_for_Modedit.cppdialog_graphic_items_options.hdialog_layers_setup.cppdialog_mask_clearance.hdialog_modedit_options.cppdialog_move_exact.hdialog_netlist.hdialog_non_copper_zones_properties.cppdialog_pad_properties.hdialog_pcb_text_properties.cppdialog_plot.hdialog_pns_diff_pair_dimensions.hdialog_pns_length_tuning_settings.hdialog_pns_settings.hdialog_print_for_modedit.cppdialog_print_using_printer.cppdialog_select_net_from_list.cppdialog_select_pretty_lib.hdialog_set_grid.cppdialog_track_via_properties.hdialog_track_via_size.hdialog_update_pcb.hwizard_3DShape_Libs_downloader.hwizard_add_fplib.h
eagle_plugin.h
exporters
gen_modules_placefile.cpp
footprint_wizard_frame.h
github
github_plugin.hhtml_link_parser.h
globaleditpad.cppgpcb_plugin.h
import_dxf
dialog_dxf_import.hdxf2brd_items.h
kicad_plugin.hlegacy_plugin.hmodule_editor_frame.hmodview_frame.hnetlist_reader.h
pcad2kicadpcb_plugin
pcad_plugin.hpcb.hpcb_arc.hpcb_line.hpcb_module.hpcb_pad.hpcb_pad_shape.hpcb_polygon.hpcb_text.h
pcb_base_edit_frame.hpcb_draw_panel_gal.hpcb_painter.hpcbnew.cppprintout_controler.hratsnest.cppratsnest_data.hratsnest_viewitem.h
router
length_tuner_tool.hpns_diff_pair_placer.hpns_dp_meander_placer.hpns_dragger.hpns_kicad_iface.cpppns_kicad_iface.hpns_line.hpns_line_placer.hpns_meander_placer.hpns_meander_skew_placer.hpns_segment.hpns_solid.hpns_tool_base.hpns_via.hrouter_preview_item.hrouter_tool.h
sel_layer.cppspecctra.htarget_edit.cpp
tools
bright_box.hdrawing_tool.hedit_constraints.hedit_points.hedit_tool.hmodule_tools.hpcb_editor_control.hpcbnew_control.hpicker_tool.hplacement_tool.hpoint_editor.hselection_area.hselection_tool.hzoom_tool.h
xchgmod.cpp
plugins
3d/vrml
v1
vrml1_base.hvrml1_coords.hvrml1_faceset.hvrml1_group.hvrml1_matbinding.hvrml1_material.hvrml1_separator.hvrml1_shapehints.hvrml1_switch.hvrml1_transform.h
v2
vrml2_appearance.hvrml2_base.hvrml2_box.hvrml2_color.hvrml2_coords.hvrml2_faceset.hvrml2_inline.hvrml2_lineset.hvrml2_material.hvrml2_norms.hvrml2_pointset.hvrml2_shape.hvrml2_switch.hvrml2_transform.h
x3d
x3d_appearance.hx3d_coords.hx3d_ifaceset.hx3d_shape.hx3d_transform.h
ldr/3d
pluginldr3D.h
polygon
clipper.hpp
utils/idftools
dxf2idf.hidf2vrml.cppidf_common.hidf_outlines.h

14
3d-viewer/3d_cache/dialogs/dlg_3d_pathconfig.h
View File

@ -39,16 +39,16 @@ private:
void initDialog();
void OnAddAlias( wxCommandEvent& event );
void OnDelAlias( wxCommandEvent& event );
void OnAliasMoveUp( wxCommandEvent& event );
void OnAliasMoveDown( wxCommandEvent& event );
void OnConfigEnvVar( wxCommandEvent& event );
void OnHelp( wxCommandEvent& event );
void OnAddAlias( wxCommandEvent& event ) override;
void OnDelAlias( wxCommandEvent& event ) override;
void OnAliasMoveUp( wxCommandEvent& event ) override;
void OnAliasMoveDown( wxCommandEvent& event ) override;
void OnConfigEnvVar( wxCommandEvent& event ) override;
void OnHelp( wxCommandEvent& event ) override;
public:
DLG_3D_PATH_CONFIG( wxWindow* aParent, S3D_FILENAME_RESOLVER* aResolver );
bool TransferDataFromWindow();
bool TransferDataFromWindow() override;
private:
void updateEnvVars( void );

2
3d-viewer/3d_cache/dialogs/dlg_select_3dmodel.h
View File

@ -64,7 +64,7 @@ public:
DLG_SELECT_3DMODEL( wxWindow* aParent, S3D_CACHE* aCacheManager, S3D_INFO* aModelItem,
wxString& prevModelSelectDir, int& prevModelWildcard );
bool TransferDataFromWindow();
bool TransferDataFromWindow() override;
void OnSelectionChanged( wxTreeEvent& event );
void OnFileActivated( wxTreeEvent& event );
void SetRootDir( wxCommandEvent& event );

20
3d-viewer/3d_cache/sg/scenegraph.h
View File

@ -57,8 +57,8 @@ private:
bool addNode( SGNODE* aNode, bool isChild );
public:
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
// note: order of transformation is Translate, Rotate, Offset
@ -73,16 +73,16 @@ public:
SCENEGRAPH( SGNODE* aParent );
virtual ~SCENEGRAPH();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
bool Prepare( const glm::dmat4* aTransform,
S3D::MATLIST& materials, std::vector< SMESH >& meshes );

20
3d-viewer/3d_cache/sg/sg_appearance.h
View File

@ -41,14 +41,14 @@ public:
SGCOLOR emissive; // default 0.0 0.0 0.0
SGCOLOR specular; // default 0.0 0.0 0.0
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
SGAPPEARANCE( SGNODE* aParent );
virtual ~SGAPPEARANCE();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
bool SetEmissive( float aRVal, float aGVal, float aBVal );
bool SetEmissive( const SGCOLOR* aRGBColor );
@ -66,15 +66,15 @@ public:
bool SetAmbient( const SGCOLOR* aRGBColor );
bool SetAmbient( const SGCOLOR& aRGBColor );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
};
#endif // SG_APPEARANCE_H

20
3d-viewer/3d_cache/sg/sg_colors.h
View File

@ -37,29 +37,29 @@ class SGCOLORS : public SGNODE
public:
std::vector< SGCOLOR > colors;
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
SGCOLORS( SGNODE* aParent );
virtual ~SGCOLORS();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
bool GetColorList( size_t& aListSize, SGCOLOR*& aColorList );
void SetColorList( size_t aListSize, const SGCOLOR* aColorList );
void AddColor( double aRedValue, double aGreenValue, double aBlueValue );
void AddColor( const SGCOLOR& aColor );
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
};
#endif // SG_COLORS_H

20
3d-viewer/3d_cache/sg/sg_coords.h
View File

@ -39,18 +39,18 @@ class SGCOORDS : public SGNODE
public:
std::vector< SGPOINT > coords;
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
SGCOORDS( SGNODE* aParent );
virtual ~SGCOORDS();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
bool GetCoordsList( size_t& aListSize, SGPOINT*& aCoordsList );
void SetCoordsList( size_t aListSize, const SGPOINT* aCoordsList );
@ -64,11 +64,11 @@ public:
*/
bool CalcNormals( SGFACESET* callingNode, SGNODE** aPtr = NULL );
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
};
#endif // SG_COORDS_H

20
3d-viewer/3d_cache/sg/sg_faceset.h
View File

@ -60,8 +60,8 @@ public:
SGCOORDS* m_RCoords;
SGNORMALS* m_RNormals;
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
// validate the data held by this face set
bool validate( void );
@ -69,19 +69,19 @@ public:
SGFACESET( SGNODE* aParent );
virtual ~SGFACESET();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode( const char *aNodeName, const SGNODE *aCaller );
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode( const char *aNodeName, const SGNODE *aCaller ) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
bool CalcNormals( SGNODE** aPtr );
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
/**
* Function GatherCoordIndices

20
3d-viewer/3d_cache/sg/sg_index.h
View File

@ -42,18 +42,18 @@ protected:
public:
// for internal SG consumption only
std::vector< int > index;
void unlinkChildNode( const SGNODE* aCaller );
void unlinkRefNode( const SGNODE* aCaller );
void unlinkChildNode( const SGNODE* aCaller ) override;
void unlinkRefNode( const SGNODE* aCaller ) override;
public:
SGINDEX( SGNODE* aParent );
virtual ~SGINDEX();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
/**
* Function GetIndices
@ -88,11 +88,11 @@ public:
*/
void AddIndex( int aIndex );
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
};
#endif // SG_INDEX_H

20
3d-viewer/3d_cache/sg/sg_normals.h
View File

@ -37,29 +37,29 @@ class SGNORMALS : public SGNODE
public:
std::vector< SGVECTOR > norms;
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
SGNORMALS( SGNODE* aParent );
virtual ~SGNORMALS();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
bool GetNormalList( size_t& aListSize, SGVECTOR*& aNormalList );
void SetNormalList( size_t aListSize, const SGVECTOR* aNormalList );
void AddNormal( double aXValue, double aYValue, double aZValue );
void AddNormal( const SGVECTOR& aNormal );
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
};
#endif // SG_NORMALS_H

20
3d-viewer/3d_cache/sg/sg_shape.h
View File

@ -51,24 +51,24 @@ public:
SGAPPEARANCE* m_RAppearance;
SGFACESET* m_RFaceSet;
void unlinkChildNode( const SGNODE* aNode );
void unlinkRefNode( const SGNODE* aNode );
void unlinkChildNode( const SGNODE* aNode ) override;
void unlinkRefNode( const SGNODE* aNode ) override;
public:
SGSHAPE( SGNODE* aParent );
virtual ~SGSHAPE();
virtual bool SetParent( SGNODE* aParent, bool notify = true );
virtual bool SetParent( SGNODE* aParent, bool notify = true ) override;
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller);
bool AddRefNode( SGNODE* aNode );
bool AddChildNode( SGNODE* aNode );
SGNODE* FindNode(const char *aNodeName, const SGNODE *aCaller) override;
bool AddRefNode( SGNODE* aNode ) override;
bool AddChildNode( SGNODE* aNode ) override;
void ReNameNodes( void );
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag );
void ReNameNodes( void ) override;
bool WriteVRML( std::ofstream& aFile, bool aReuseFlag ) override;
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode );
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode );
bool WriteCache( std::ofstream& aFile, SGNODE* parentNode ) override;
bool ReadCache( std::ifstream& aFile, SGNODE* parentNode ) override;
bool Prepare( const glm::dmat4* aTransform,
S3D::MATLIST& materials, std::vector< SMESH >& meshes );

2
3d-viewer/3d_canvas/status_text_reporter.h
View File

@ -50,7 +50,7 @@ public:
m_hasMessage = false;
}
REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED )
REPORTER& Report( const wxString& aText, SEVERITY aSeverity = RPT_UNDEFINED ) override
{
if( !aText.IsEmpty() )
m_hasMessage = true;

6
3d-viewer/3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h
View File

@ -64,10 +64,10 @@ public:
~C3D_RENDER_OGL_LEGACY();
// Imported from C3D_RENDER_BASE
void SetCurWindowSize( const wxSize &aSize );
bool Redraw( bool aIsMoving, REPORTER *aStatusTextReporter );
void SetCurWindowSize( const wxSize &aSize ) override;
bool Redraw( bool aIsMoving, REPORTER *aStatusTextReporter ) override;
int GetWaitForEditingTimeOut();
int GetWaitForEditingTimeOut() override;
private:
bool initializeOpenGL();

8
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.h
View File

@ -118,10 +118,10 @@ public:
~CBVH_PBRT();
// Imported from CGENERICACCELERATOR
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo, unsigned int aAccNodeInfo ) const;
bool Intersect(const RAYPACKET &aRayPacket, HITINFO_PACKET *aHitInfoPacket ) const;
bool IntersectP( const RAY &aRay, float aMaxDistance ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const override;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo, unsigned int aAccNodeInfo ) const override;
bool Intersect(const RAYPACKET &aRayPacket, HITINFO_PACKET *aHitInfoPacket ) const override;
bool IntersectP( const RAY &aRay, float aMaxDistance ) const override;
private:

4
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer.h
View File

@ -76,8 +76,8 @@ private:
class CCONTAINER : public CGENERICCONTAINER
{
public:
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const;
bool IntersectP( const RAY &aRay, float aMaxDistance ) const;
bool Intersect( const RAY &aRay, HITINFO &aHitInfo ) const override;
bool IntersectP( const RAY &aRay, float aMaxDistance ) const override;
};
#endif // _CCONTAINER_H_

4
3d-viewer/3d_rendering/3d_render_raytracing/accelerators/ccontainer2d.h
View File

@ -80,7 +80,7 @@ public:
// Imported from CGENERICCONTAINER2D
void GetListObjectsIntersects( const CBBOX2D & aBBox,
CONST_LIST_OBJECT2D &aOutList ) const;
CONST_LIST_OBJECT2D &aOutList ) const override;
};
@ -117,7 +117,7 @@ public:
// Imported from CGENERICCONTAINER2D
void GetListObjectsIntersects( const CBBOX2D & aBBox,
CONST_LIST_OBJECT2D &aOutList ) const;
CONST_LIST_OBJECT2D &aOutList ) const override;
};
#endif // _CCONTAINER2D_H_

6
3d-viewer/3d_rendering/3d_render_raytracing/c3d_render_raytracing.h
View File

@ -64,10 +64,10 @@ public:
~C3D_RENDER_RAYTRACING();
// Imported from C3D_RENDER_BASE
void SetCurWindowSize( const wxSize &aSize );
bool Redraw(bool aIsMoving, REPORTER *aStatusTextReporter );
void SetCurWindowSize( const wxSize &aSize ) override;
bool Redraw(bool aIsMoving, REPORTER *aStatusTextReporter ) override;
int GetWaitForEditingTimeOut();
int GetWaitForEditingTimeOut() override;
private:
bool initializeOpenGL();

4
3d-viewer/3d_rendering/3d_render_raytracing/clight.h
View File

@ -83,7 +83,7 @@ public:
void GetLightParameters( const SFVEC3F &aHitPoint,
SFVEC3F &aOutVectorToLight,
SFVEC3F &aOutLightColor,
float &aOutDistance ) const
float &aOutDistance ) const override
{
const SFVEC3F vectorLight = m_position - aHitPoint;
@ -134,7 +134,7 @@ public:
void GetLightParameters( const SFVEC3F &aHitPoint,
SFVEC3F &aOutVectorToLight,
SFVEC3F &aOutLightColor,
float &aOutDistance ) const
float &aOutDistance ) const override
{
(void)aHitPoint; // unused

2
3d-viewer/3d_rendering/3d_render_raytracing/cmaterial.h
View File

@ -123,7 +123,7 @@ public:
const SFVEC3F &aDiffuseObjColor,
const SFVEC3F &aDirToLight,
const SFVEC3F &aLightColor,
float aShadowAttenuationFactor ) const;
float aShadowAttenuationFactor ) const override;
};
#endif // _CMATERIAL_H_

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cfilledcircle2d.h
View File

@ -48,11 +48,11 @@ public:
CFILLEDCIRCLE2D( const SFVEC2F &aCenter, float aRadius, const BOARD_ITEM &aBoardItem );
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/citemlayercsg2d.h
View File

@ -91,11 +91,11 @@ public:
~CITEMLAYERCSG2D();
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};

20
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon2d.h
View File

@ -102,11 +102,11 @@ public:
const BOARD_ITEM &aBoardItem );
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};
@ -126,11 +126,11 @@ public:
CDUMMYBLOCK2D( const CBBOX2D &aBBox, const BOARD_ITEM &aBoardItem );
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};
/**

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon4pts2d.h
View File

@ -62,11 +62,11 @@ public:
const SFVEC2F &GetN3() const { return m_seg_normal[3]; }
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cring2d.h
View File

@ -54,11 +54,11 @@ public:
const BOARD_ITEM &aBoardItem );
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/croundsegment2d.h
View File

@ -78,11 +78,11 @@ public:
const SFVEC2F &GetRightDir() const { return m_rightDir; }
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};
static const float s_min_dot = (FLT_EPSILON * 4.0f) ;

10
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/ctriangle2d.h
View File

@ -60,11 +60,11 @@ public:
const SFVEC2F &GetP3() const { return p3; }
// Imported from COBJECT2D
bool Overlaps( const CBBOX2D &aBBox ) const;
bool Intersects( const CBBOX2D &aBBox ) const;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const;
bool IsPointInside( const SFVEC2F &aPoint ) const;
bool Overlaps( const CBBOX2D &aBBox ) const override;
bool Intersects( const CBBOX2D &aBBox ) const override;
bool Intersect( const RAYSEG2D &aSegRay, float *aOutT, SFVEC2F *aNormalOut ) const override;
INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const override;
bool IsPointInside( const SFVEC2F &aPoint ) const override;
};

Some files were not shown because too many files have changed in this diff Show More